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

Merge pull request #362 from bitraid/disable-strip-reloc-unpack

Browse Source 
Don't use --strip-reloc with -d
This commit is contained in:
John Reiser
2020-05-25 07:54:33 -07:00
committed by GitHub
parent 78c3f58f50 179f4b3439
commit 308d2b30f9
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pefile.cpp
+2 -14
View File
@@ -2693,15 +2693,7 @@ void PeFile::rebuildRelocs(upx_byte *& extrainfo, unsigned bits,
} }
rel.finish (oxrelocs,soxrelocs); rel.finish (oxrelocs,soxrelocs);
if (opt->win32_pe.strip_relocs && !isdll) omemcpy(obuf + ODADDR(PEDIR_RELOC) - rvamin,oxrelocs,soxrelocs);
{
obuf.clear(ODADDR(PEDIR_RELOC) - rvamin, ODSIZE(PEDIR_RELOC));
ODADDR(PEDIR_RELOC) = 0;
soxrelocs = 0;
// FIXME: try to remove the original relocation section somehow
}
else
omemcpy(obuf + ODADDR(PEDIR_RELOC) - rvamin,oxrelocs,soxrelocs);
delete [] oxrelocs; oxrelocs = NULL; delete [] oxrelocs; oxrelocs = NULL;
wrkmem.dealloc(); wrkmem.dealloc();
@@ -2933,12 +2925,8 @@ void PeFile::unpack0(OutputFile *fo, const ht &ih, ht &oh,
ft.unfilter(obuf + oh.codebase - rvamin, oh.codesize); ft.unfilter(obuf + oh.codebase - rvamin, oh.codesize);
} }
//NEW: disable reloc stripping if ASLR is enabled
if(ih.dllflags & IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE)
opt->win32_pe.strip_relocs = false;
// FIXME: ih.flags is checked here because of a bug in UPX 0.92 // FIXME: ih.flags is checked here because of a bug in UPX 0.92
if ((opt->win32_pe.strip_relocs && !isdll) || (ih.flags & RELOCS_STRIPPED)) if (ih.flags & RELOCS_STRIPPED)
{ {
oh.flags |= RELOCS_STRIPPED; oh.flags |= RELOCS_STRIPPED;
ODADDR(PEDIR_RELOC) = 0; ODADDR(PEDIR_RELOC) = 0;