mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Avoid overwrite of obuf when hdr_buf and non-first method.

Browse Source 
committer: jreiser <jreiser> 1141327368 +0000
This commit is contained in:
John Reiser 2006-03-02 19:22:48 +00:00
parent b389abd99f
commit 70ba662574
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/packer.cpp
View File

@ -342,9 +342,9 @@ bool Packer::testOverlappingDecompression(const upx_bytep buf,
return false; return false;
assert((int)overlap_overhead >= 0); assert((int)overlap_overhead >= 0);
// Because we are not using the asm_fast decompressor here // Because upx_test_overlap() does not use the asm_fast decompressor
// we must account for extra 3 bytes or else we may fail // we must account for extra 3 bytes that asm_fast does use,
// at runtime decompression. // or else we may fail at runtime decompression.
if (overlap_overhead <= 4 + 3) // don't waste time here if (overlap_overhead <= 4 + 3) // don't waste time here
return false; return false;
overlap_overhead -= 3; overlap_overhead -= 3;
@ -1401,8 +1401,13 @@ void Packer::compressWithFilters(Filter *parm_ft,
unsigned result[16]; unsigned result[16];
upx_compress_config_t conf; upx_compress_config_t conf;
memset(&conf, 0xff, sizeof(conf)); memset(&conf, 0xff, sizeof(conf));
int r = upx_compress(hdr_buf, hdr_u_len, obuf, &hdr_clen, if (0 < m && otemp == &obuf) { // do not overwrite obuf
otemp_buf.allocForCompression(compress_buf_len);
otemp = &otemp_buf;
}
int r = upx_compress(hdr_buf, hdr_u_len, *otemp, &hdr_clen,
0, methods[m], 10, &conf, result); 0, methods[m], 10, &conf, result);
(void)r;
} }
for (int i = 0; i < nfilters; i++) // for all filters for (int i = 0; i < nfilters; i++) // for all filters
{ {