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

If testOverlappingDecompression() fails, just treat the block as

Browse Source 
non-compressible.

committer: mfx <mfx> 1036971145 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2002-11-10 23:32:25 +00:00
parent c798242bfe
commit a94a3e9741
3 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_lx_elf.cpp
+14 -9
View File
@@ -194,23 +194,28 @@ void PackLinuxI386elf::packExtent(
if (ph.c_len < ph.u_len) {
ph.overlap_overhead = OVERHEAD;
if (!testOverlappingDecompression(obuf, ph.overlap_overhead)) {
throwNotCompressible();
// not in-place compressible
ph.c_len = ph.u_len;
}
}
else {
ph. c_len = ph.u_len;
if (ph.c_len >= ph.u_len) {
// block is not compressible
ph.c_len = ph.u_len;
// must update checksum of compressed data
ph.c_adler = upx_adler32(ibuf, ph.u_len, ph.c_adler);
ph.c_adler = upx_adler32(ibuf, ph.u_len, ph.saved_c_adler);
}
// write block sizes
b_info tmp; memset(&tmp, 0, sizeof(tmp));
b_info tmp;
memset(&tmp, 0, sizeof(tmp));
set_native32(&tmp.sz_unc, ph.u_len);
set_native32(&tmp.sz_cpr, ph.c_len);
tmp.b_method = ph.method;
if (ft) {
tmp.b_ftid = ft->id;
tmp.b_cto8 = ft->cto;
if (ph.c_len < ph.u_len) {
tmp.b_method = ph.method;
if (ft) {
tmp.b_ftid = ft->id;
tmp.b_cto8 = ft->cto;
}
}
fo->write(&tmp, sizeof(tmp));
b_len += sizeof(b_info);