mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

PackMachBase::unpack() process lc_seg in same order as ::pack()

Browse Source
This commit is contained in:
John Reiser 2015-05-16 15:20:03 -07:00
parent 2238c99b61
commit 1d13d8c4a0
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/p_mach.cpp
View File

@ -1286,7 +1286,7 @@ void PackMachBase<T>::unpack(OutputFile *fo)
unsigned orig_file_size = get_te32(&hbuf.p_filesize); unsigned orig_file_size = get_te32(&hbuf.p_filesize);
blocksize = get_te32(&hbuf.p_blocksize); blocksize = get_te32(&hbuf.p_blocksize);
if (file_size > (off_t)orig_file_size || blocksize > orig_file_size if (file_size > (off_t)orig_file_size || blocksize > orig_file_size
|| blocksize > 0x01000000) || blocksize > 0x05000000) // emacs-21.2.1 was 0x01d47e6c (== 30703212)
throwCantUnpack("file header corrupted"); throwCantUnpack("file header corrupted");
ibuf.alloc(blocksize + OVERHEAD); ibuf.alloc(blocksize + OVERHEAD);
@ -1333,33 +1333,26 @@ void PackMachBase<T>::unpack(OutputFile *fo)
unsigned total_out = 0; unsigned total_out = 0;
unsigned c_adler = upx_adler32(NULL, 0); unsigned c_adler = upx_adler32(NULL, 0);
unsigned u_adler = upx_adler32(NULL, 0); unsigned u_adler = upx_adler32(NULL, 0);
Mach_segment_command const *sc = (Mach_segment_command const *)(void *)(1+ mhdr);
unsigned k;
fi->seek(- (off_t)(sizeof(bhdr) + ph.c_len), SEEK_CUR); fi->seek(- (off_t)(sizeof(bhdr) + ph.c_len), SEEK_CUR);
for ( for (unsigned k = 0; k < ncmds; ++k) {
k = 0; if (msegcmd[k].cmd==lc_seg && msegcmd[k].filesize!=0) {
k < ncmds;
(++k), (sc = (Mach_segment_command const *)(sc->cmdsize + (char const *)sc))
) {
if (lc_seg==sc->cmd
&& 0!=sc->filesize ) {
if (fo) if (fo)
fo->seek(sc->fileoff, SEEK_SET); fo->seek(msegcmd[k].fileoff, SEEK_SET);
unsigned filesize = sc->filesize; unpackExtent(msegcmd[k].filesize, fo, total_in, total_out,
unpackExtent(filesize, fo, total_in, total_out,
c_adler, u_adler, false, sizeof(bhdr)); c_adler, u_adler, false, sizeof(bhdr));
if (my_filetype==Mach_header::MH_DYLIB) { if (my_filetype==Mach_header::MH_DYLIB) {
break; break; // only the first lc_seg when MH_DYLIB
} }
} }
} }
if (my_filetype==Mach_header::MH_DYLIB) { Mach_segment_command const *sc = (Mach_segment_command const *)(void *)(1+ mhdr);
if (my_filetype==Mach_header::MH_DYLIB) { // rest of lc_seg are not compressed
Mach_segment_command const *rc = rawmseg; Mach_segment_command const *rc = rawmseg;
rc = (Mach_segment_command const *)(rc->cmdsize + (char const *)rc); rc = (Mach_segment_command const *)(rc->cmdsize + (char const *)rc);
sc = (Mach_segment_command const *)(sc->cmdsize + (char const *)sc); sc = (Mach_segment_command const *)(sc->cmdsize + (char const *)sc);
for ( for (
k=1; unsigned k=1; // skip first lc_seg, which was uncompressed above
k < ncmds; k < ncmds;
(++k), (sc = (Mach_segment_command const *)(sc->cmdsize + (char const *)sc)), (++k), (sc = (Mach_segment_command const *)(sc->cmdsize + (char const *)sc)),
(rc = (Mach_segment_command const *)(rc->cmdsize + (char const *)rc)) (rc = (Mach_segment_command const *)(rc->cmdsize + (char const *)rc))