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

Avoid overlap when rebuild relocs.

Browse Source 
Based on a hint from a little bird.
	modified:   packer.cpp
This commit is contained in:
John Reiser 2020-09-20 15:08:39 -07:00 committed by Markus F.X.J. Oberhumer
parent 143049922b
commit 890d66ecf0
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/packer.cpp
View File

@ -999,12 +999,13 @@ unsigned Packer::unoptimizeReloc(upx_byte **in, upx_byte *image,
p += 4;
p += 2;
}
upx_byte const *in_end = p;
//fprintf(stderr,"relocnum=%x\n",relocn);
out->alloc(4*relocn+4); // one extra data
LE32 *outp = (LE32*) (unsigned char *) *out;
LE32 *relocs = outp;
unsigned jc = (unsigned) -4;
for (p = *in; *p; p++)
for (p = *in; p < in_end; p++)
{
if (*p < 0xF0)
jc += *p;
@ -1020,17 +1021,27 @@ unsigned Packer::unoptimizeReloc(upx_byte **in, upx_byte *image,
jc += dif;
}
*relocs++ = jc;
if (!--relocn) {
break;
}
if (bswap && image)
{
if (bits == 32)
if (bits == 32) {
acc_ua_swab32s(image + jc);
else if (bits == 64)
if (((image + jc) - p) < 4) { // data cannot overlap control
p = image + jc + 4;
}
}
else if (bits == 64) {
set_be64(image + jc, get_le64(image + jc));
if (((image + jc) - p) < 8) { // data cannot overlap control
p = image + jc + 8;
}
}
else
throwInternalError("unoptimizeReloc problem");
}
}
//fprintf(stderr,"relocnum=%x\n",relocn);
*in = p+1;
return (unsigned) (relocs - outp);
}