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

Merge branch 'jreiser' into devel

Browse Source
This commit is contained in:
John Reiser 2017-04-03 12:57:57 -07:00
commit ef97af71e3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/p_mach.cpp
View File

@ -1531,10 +1531,14 @@ void PackMachBase<T>::unpack(OutputFile *fo)
p_info hbuf;
fi->readx(&hbuf, sizeof(hbuf));
unsigned const orig_file_size = get_te32(&hbuf.p_filesize);
blocksize = get_te32(&hbuf.p_blocksize);
if (file_size > (off_t)orig_file_size || blocksize > orig_file_size
|| blocksize > 0x05000000) // emacs-21.2.1 was 0x01d47e6c (== 30703212)
blocksize = get_te32(&hbuf.p_blocksize); // emacs-21.2.1 was 0x01d47e6c (== 30703212)
if (blocksize > orig_file_size || blocksize > 0x05000000)
throwCantUnpack("file header corrupted");
if (file_size > (off_t)orig_file_size) {
opt->info_mode += !opt->info_mode ? 1 : 0; // make visible
opt->backup = 1;
infoWarning("packed size too big; discarding appended data, keeping backup");
}
ibuf.alloc(blocksize + OVERHEAD);
b_info bhdr; memset(&bhdr, 0, sizeof(bhdr));