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

merge

Browse Source
This commit is contained in:
John Reiser
2010-02-20 20:38:20 -08:00
parent 36de249066 5085f3a15e
commit 7add104313
5 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+2 -1
View File
@@ -685,7 +685,7 @@ PackLinuxElf64amd::defineSymbols(Filter const *)
unsigned lenu;
len += (7&-lsize) + lsize;
bool const is_big = (lo_va_user < (lo_va_stub + len + 2*page_size));
if (is_big) {
if (is_big && ehdri.ET_EXEC==get_te16(&ehdri.e_type)) {
set_te64( &elfout.ehdr.e_entry,
get_te64(&elfout.ehdr.e_entry) + lo_va_user - lo_va_stub);
set_te64(&elfout.phdr[0].p_vaddr, lo_va_user);
@@ -1389,6 +1389,7 @@ PackLinuxElf64::generateElfHdr(
cprElfHdr2 *const h2 = (cprElfHdr2 *)(void *)&elfout;
cprElfHdr3 *const h3 = (cprElfHdr3 *)(void *)&elfout;
memcpy(h3, proto, sizeof(*h3)); // reads beyond, but OK
h3->ehdr.e_type = ehdri.e_type; // ET_EXEC vs ET_DYN (gcc -pie -fPIC)
h3->ehdr.e_ident[Elf32_Ehdr::EI_OSABI] = ei_osabi;
assert(get_te32(&h2->ehdr.e_phoff) == sizeof(Elf64_Ehdr));