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

fixed a rare bug in the relocation handling code.

Browse Source 
committer: ml1050 <ml1050> 976488481 +0000
This commit is contained in:
László Molnár
2000-12-10 22:48:01 +00:00
parent ca7fc906cd
commit 2afc76f0e9
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_w32pe.cpp
+4 -5
View File
@@ -369,7 +369,8 @@ void Reloc::finish(upx_byte *&p,unsigned &siz)
} }
p = start; p = start;
siz = ptr_diff(rel1,start) &~ 3; siz = ptr_diff(rel1,start) &~ 3;
siz -= 8; siz -= 4;
rel->pagestart = 0; // terminating 0
assert(siz > 0); assert(siz > 0);
start = 0; // safety start = 0; // safety
} }
@@ -1704,7 +1705,7 @@ void PackW32Pe::pack(OutputFile *fo)
// section 2 should start with the resource data, because lots of lame // section 2 should start with the resource data, because lots of lame
// windoze codes assume that resources starts on the beginning of a section // windoze codes assume that resources starts on the beginning of a section
// identsplit - number of ident + (upx header) bytes to put into the PE heaader // identsplit - number of ident + (upx header) bytes to put into the PE header
int identsplit = pe_offset + sizeof(osection) + sizeof(oh); int identsplit = pe_offset + sizeof(osection) + sizeof(oh);
if ((identsplit & 0x1ff) == 0) if ((identsplit & 0x1ff) == 0)
identsplit = 0; identsplit = 0;
@@ -1715,9 +1716,7 @@ void PackW32Pe::pack(OutputFile *fo)
ic = identsize - identsplit; ic = identsize - identsplit;
const unsigned clen = ((ph.c_len + ic) & 15) == 0 ? ph.c_len : ph.c_len + 16 - ((ph.c_len + ic) & 15); const unsigned clen = ((ph.c_len + ic) & 15) == 0 ? ph.c_len : ph.c_len + 16 - ((ph.c_len + ic) & 15);
memset(obuf + ph.c_len, 0, clen - ph.c_len);
// FIXME: Laszlo: what about this memset ?
//memset(obuf + ph.c_len, 0, clen - ph.c_len);
const unsigned s1size = ALIGN_UP(ic + clen + codesize,4) + sotls; const unsigned s1size = ALIGN_UP(ic + clen + codesize,4) + sotls;
const unsigned s1addr = (newvsize - (ic + clen) + oam1) &~ oam1; const unsigned s1addr = (newvsize - (ic + clen) + oam1) &~ oam1;