Merge branch 'devel' of https://github.com/upx/upx into devel

This commit is contained in:
John Reiser
2016-10-02 10:47:59 -07:00
9 changed files with 127 additions and 88 deletions
+2 -2
View File
@@ -2086,7 +2086,7 @@ int PackMachBase<T>::canUnpack()
unsigned const *p;
for (p = (unsigned const *)&buf[0x1000]; p > lo; ) if (*--p) {
overlay_offset = *(TE32 const *)p;
if (overlay_offset < offLINK) {
if ((off_t)overlay_offset < offLINK) {
overlay_offset -= (char const *)p - (char const *)lo
+ (offLINK - 0x1000) - sizeof(l_info);
fi->seek(overlay_offset, SEEK_SET);
@@ -2097,7 +2097,7 @@ int PackMachBase<T>::canUnpack()
}
}
}
overlay_offset = 0;
}
}