mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-10-26 23:36:41 +08:00
Code Issues Releases Wiki Activity

Merge branch 'devel' into jreiser

Browse Source
This commit is contained in:
John Reiser
2017-04-07 08:22:08 -07:00
parent 8bca8629be 994c3c3552
commit 7c16872a6e
4 changed files with 300 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/p_lx_elf.cpp
View File

@@ -1498,7 +1498,12 @@ bool PackLinuxElf32::canPack()
if (1!=exetype && phdr->PT_LOAD32 == p_type) { // 1st PT_LOAD
exetype = 1;
load_va = get_te32(&phdr->p_vaddr); // class data member
unsigned const off = ~page_mask & load_va;
// Cast on next line is to avoid a compiler bug (incorrect complaint) in
// Microsoft (R) C/C++ Optimizing Compiler Version 19.00.24215.1 for x64
// error C4319: '~': zero extending 'unsigned int' to 'upx_uint64_t' of greater size
unsigned const off = ~page_mask & (unsigned)load_va;
if (off && off == p_offset) { // specific hint
throwCantPack("Go-language PT_LOAD: try hemfix.c, or try '--force-execve'");
// Fixing it inside upx fails because packExtent() reads original file.