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

bug in other-endian ::canPack and ::canUnpack

Browse Source 
modified:   p_mach.cpp
This commit is contained in:
John Reiser
2016-11-05 14:02:51 -07:00
parent 2635472896
commit 7dc004acb3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_mach.cpp
+5 -3
View File
@@ -1678,10 +1678,11 @@ int PackMachBase<T>::canUnpack()
TE32 const *uptr = (TE32 const *)&buf[bufsize]; TE32 const *uptr = (TE32 const *)&buf[bufsize];
while (0==*--uptr) /*empty*/ ; while (0==*--uptr) /*empty*/ ;
overlay_offset = *uptr; overlay_offset = *uptr;
if (overlay_offset < 0x1000) { if (mhdri.sizeofcmds <= overlay_offset && overlay_offset < 0x1000) {
return true; // success return true; // success
} }
overlay_offset = 0; overlay_offset = 0;
return false;
} }
if (392==style) { if (392==style) {
overlay_offset = 0x100c; // (l_info precedes;) p_info; b_info; cpr_data overlay_offset = 0x100c; // (l_info precedes;) p_info; b_info; cpr_data
@@ -1767,8 +1768,9 @@ bool PackMachBase<T>::canPack()
msegcmd = new Mach_segment_command[ncmds]; msegcmd = new Mach_segment_command[ncmds];
unsigned char const *ptr = (unsigned char const *)rawmseg; unsigned char const *ptr = (unsigned char const *)rawmseg;
for (unsigned j= 0; j < ncmds; ++j) { for (unsigned j= 0; j < ncmds; ++j) {
if (lc_seg == *(unsigned const *)ptr) { Mach_segment_command const *segptr = (Mach_segment_command const *)ptr;
msegcmd[j] = *(Mach_segment_command const *)ptr; if (lc_seg == segptr->cmd) {
msegcmd[j] = *segptr;
} }
else { else {
memcpy(&msegcmd[j], ptr, 2*sizeof(unsigned)); // cmd and size memcpy(&msegcmd[j], ptr, 2*sizeof(unsigned)); // cmd and size