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

shlib: Don't compress below xct_off (except Elf headers)

Browse Source 
modified:   p_lx_elf.cpp
This commit is contained in:
John Reiser
2021-04-11 15:16:34 -07:00
committed by Markus F.X.J. Oberhumer
parent 613df414ed
commit 333a288248
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+3 -2
View File
@@ -4198,7 +4198,7 @@ int PackLinuxElf64::pack2(OutputFile *fo, Filter &ft)
uip->ui_total_passes -= !!is_shlib; // not .data of shlib uip->ui_total_passes -= !!is_shlib; // not .data of shlib
// compress extents // compress extents
unsigned hdr_u_len = (is_shlib ? xct_off : (sizeof(Elf64_Ehdr) + sz_phdrs)); unsigned hdr_u_len = sizeof(Elf64_Ehdr) + sz_phdrs;
total_in = (is_shlib ? 0 : xct_off); total_in = (is_shlib ? 0 : xct_off);
total_out = (is_shlib ? sz_elf_hdrs : xct_off); total_out = (is_shlib ? sz_elf_hdrs : xct_off);
@@ -4226,7 +4226,7 @@ int PackLinuxElf64::pack2(OutputFile *fo, Filter &ft)
x.size = get_te64(&phdri[k].p_filesz); x.size = get_te64(&phdri[k].p_filesz);
if (!is_shlib || hdr_u_len < (u64_t)x.size) { if (!is_shlib || hdr_u_len < (u64_t)x.size) {
if (0 == nx) { // 1st PT_LOAD64 must cover Ehdr at 0==p_offset if (0 == nx) { // 1st PT_LOAD64 must cover Ehdr at 0==p_offset
unsigned const delta = hdr_u_len; unsigned const delta = (is_shlib ? xct_off : hdr_u_len);
if (ft.id < 0x40) { if (ft.id < 0x40) {
// FIXME: ?? ft.addvalue += asl_delta; // FIXME: ?? ft.addvalue += asl_delta;
} }
@@ -4236,6 +4236,7 @@ int PackLinuxElf64::pack2(OutputFile *fo, Filter &ft)
// &ft arg to packExtent will be zero becaue (k != nk_f) // &ft arg to packExtent will be zero becaue (k != nk_f)
} }
else { else {
total_in += delta - hdr_u_len;
x.offset += delta; x.offset += delta;
x.size -= delta; x.size -= delta;
} }