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

Unpack detects is_shlib more robustly. Dispute .e_shoff.

Browse Source
This commit is contained in:
John Reiser
2013-11-16 14:25:53 -08:00
parent 6b63aba1fc
commit c5c9921b59
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+2 -1
View File
@@ -389,6 +389,7 @@ void PackLinuxElf32::pack3(OutputFile *fo, Filter &ft)
} }
ehdri.e_shnum = 0; ehdri.e_shnum = 0;
ehdri.e_shoff = old_dtinit; // easy to find for unpacking ehdri.e_shoff = old_dtinit; // easy to find for unpacking
ehdri.e_shoff = 0;
ehdri.e_shentsize = 0; ehdri.e_shentsize = 0;
ehdri.e_shstrndx = 0; ehdri.e_shstrndx = 0;
} }
@@ -3522,7 +3523,7 @@ void PackLinuxElf32::unpack(OutputFile *fo)
ph.u_len = get_te32(&bhdr.sz_unc); ph.u_len = get_te32(&bhdr.sz_unc);
ph.c_len = get_te32(&bhdr.sz_cpr); ph.c_len = get_te32(&bhdr.sz_cpr);
ph.filter_cto = bhdr.b_cto8; ph.filter_cto = bhdr.b_cto8;
bool const is_shlib = (ehdr->e_shoff!=0); bool const is_shlib = (ehdr->e_entry==0) || (ehdr->e_shoff!=0);
// Peek at resulting Ehdr and Phdrs for use in controlling unpacking. // Peek at resulting Ehdr and Phdrs for use in controlling unpacking.
// Uncompress an extra time, and don't verify or update checksums. // Uncompress an extra time, and don't verify or update checksums.