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 'devel' into jreiser-android

Browse Source 
modified:   p_lx_elf.cpp
This commit is contained in:
John Reiser 2018-01-22 13:55:45 -08:00
commit 98a0d381e9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p_lx_elf.cpp
View File

@ -3296,10 +3296,10 @@ int PackLinuxElf64::pack2(OutputFile *fo, Filter &ft)
uip->ui_total_passes -= !!is_shlib; // not .data of shlib
// compress extents
unsigned hdr_u_len = xct_off;
unsigned hdr_u_len = (is_shlib ? xct_off : (sizeof(Elf64_Ehdr) + sz_phdrs));
unsigned total_in = 0;
unsigned total_out = sz_elf_hdrs;
unsigned total_in = (is_shlib ? 0 : xct_off);
unsigned total_out = (is_shlib ? sz_elf_hdrs : xct_off);
uip->ui_pass = 0;
ft.addvalue = 0;
@ -3313,7 +3313,7 @@ int PackLinuxElf64::pack2(OutputFile *fo, Filter &ft)
x.offset = get_te64(&phdri[k].p_offset);
x.size = get_te64(&phdri[k].p_filesz);
if (0 == nx) { // 1st PT_LOAD64 must cover Ehdr at 0==p_offset
unsigned const delta = xct_off;
unsigned const delta = hdr_u_len;
if (ft.id < 0x40) {
// FIXME: ?? ft.addvalue += asl_delta;
}