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

pe: fixed unpack problem in rebuildImports()

Browse Source
This commit is contained in:
László Molnár 2006-06-23 11:17:26 +02:00
parent 28d56bab04
commit d2c36eefc9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/p_armpe.cpp
View File

@ -2247,6 +2247,7 @@ void PackArmPe::rebuildImports(upx_byte *& extrainfo)
import_desc *im = im0; import_desc *im = im0;
upx_byte *dllnames = Obuf + inamespos; upx_byte *dllnames = Obuf + inamespos;
upx_byte *importednames = dllnames + sdllnames; upx_byte *importednames = dllnames + sdllnames;
upx_byte * const importednames_start = importednames;
for (p = idata; get_le32(p) != 0; ++p) for (p = idata; get_le32(p) != 0; ++p)
{ {
@ -2282,7 +2283,7 @@ void PackArmPe::rebuildImports(upx_byte *& extrainfo)
const unsigned ilen = strlen(++p) + 1; const unsigned ilen = strlen(++p) + 1;
if (inamespos) if (inamespos)
{ {
if (ptr_diff(importednames,oimpdlls) & 1) if (ptr_diff(importednames, importednames_start) & 1)
importednames -= 1; importednames -= 1;
omemcpy(importednames + 2, p, ilen); omemcpy(importednames + 2, p, ilen);
//;;;printf(" %s",importednames+2); //;;;printf(" %s",importednames+2);

4
src/p_w32pe.cpp
View File

@ -2353,6 +2353,7 @@ void PackW32Pe::rebuildImports(upx_byte *& extrainfo)
import_desc *im = im0; import_desc *im = im0;
upx_byte *dllnames = Obuf + inamespos; upx_byte *dllnames = Obuf + inamespos;
upx_byte *importednames = dllnames + sdllnames; upx_byte *importednames = dllnames + sdllnames;
upx_byte * const importednames_start = importednames;
for (p = idata; get_le32(p) != 0; ++p) for (p = idata; get_le32(p) != 0; ++p)
{ {
@ -2388,8 +2389,7 @@ void PackW32Pe::rebuildImports(upx_byte *& extrainfo)
const unsigned ilen = strlen(++p) + 1; const unsigned ilen = strlen(++p) + 1;
if (inamespos) if (inamespos)
{ {
assert(oimpdlls != NULL); // FIXME if (ptr_diff(importednames, importednames_start) & 1)
if (ptr_diff(importednames,oimpdlls) & 1)
importednames -= 1; importednames -= 1;
omemcpy(importednames + 2, p, ilen); omemcpy(importednames + 2, p, ilen);
//;;;printf(" %s",importednames+2); //;;;printf(" %s",importednames+2);