jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

0==.vmsize in Go-language LC_SEGMENT_64; also g++ 5.1.1 nit

Browse Source
This commit is contained in:
John Reiser
2015-07-25 12:54:25 -07:00
parent ac1ccaa246
commit 163e1907a4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_mach.cpp
+3 -3
View File
@@ -1270,7 +1270,7 @@ void PackMachBase<T>::unpack(OutputFile *fo)
throwCantUnpack("file header corrupted"); throwCantUnpack("file header corrupted");
} }
unsigned const sz_cmds = mhdri.sizeofcmds; unsigned const sz_cmds = mhdri.sizeofcmds;
if ((sizeof(mhdri) + sz_cmds) > fi->st_size()) { if ((sizeof(mhdri) + sz_cmds) > (size_t)fi->st_size()) {
throwCantUnpack("file header corrupted"); throwCantUnpack("file header corrupted");
} }
rawmseg = (Mach_segment_command *)new char[sz_cmds]; rawmseg = (Mach_segment_command *)new char[sz_cmds];
@@ -1425,11 +1425,11 @@ bool PackMachBase<T>::canPack()
// Check alignment of non-null LC_SEGMENT. // Check alignment of non-null LC_SEGMENT.
for (unsigned j= 0; j < ncmds; ++j) { for (unsigned j= 0; j < ncmds; ++j) {
if (lc_seg==msegcmd[j].cmd) { if (lc_seg==msegcmd[j].cmd) {
if (msegcmd[j].vmsize==0)
break; // was sorted last
if (~PAGE_MASK & (msegcmd[j].fileoff | msegcmd[j].vmaddr)) { if (~PAGE_MASK & (msegcmd[j].fileoff | msegcmd[j].vmaddr)) {
return false; return false;
} }
if (msegcmd[j].vmsize==0)
break; // was sorted last
// We used to check that LC_SEGMENTS were contiguous, // We used to check that LC_SEGMENTS were contiguous,
// but apparently that is not needed anymore, // but apparently that is not needed anymore,