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

compressWithFilters(..., inhibit_compression_check=0) // SourceForge bug 3541020

Browse Source 
Not good to check compression ratio on every block when blocksize < file_size,
as when --force_execve of Elf > 0x80000 bytes.
This commit is contained in:
John Reiser
2012-07-12 07:04:56 -07:00
parent a6d717cb04
commit f383629282
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/packer.cpp
+19 -12
View File
@@ -1311,7 +1311,8 @@ void Packer::compressWithFilters(upx_bytep i_ptr, unsigned i_len,
Filter *parm_ft,
const unsigned overlap_range,
const upx_compress_config_t *cconf,
int filter_strategy)
int filter_strategy,
int inhibit_compression_check)
{
parm_ft->buf_len = f_len;
// struct copies
@@ -1487,14 +1488,17 @@ void Packer::compressWithFilters(upx_bytep i_ptr, unsigned i_len,
this->ph = best_ph;
*parm_ft = best_ft;
// finally check compression ratio
if (best_ph.c_len + best_ph_lsize >= best_ph.u_len)
throwNotCompressible();
if (!checkCompressionRatio(best_ph.u_len, best_ph.c_len))
throwNotCompressible();
// Finally, check compression ratio.
// Might be inhibited when blocksize < file_size, for instance.
if (!inhibit_compression_check) {
if (best_ph.c_len + best_ph_lsize >= best_ph.u_len)
throwNotCompressible();
if (!checkCompressionRatio(best_ph.u_len, best_ph.c_len))
throwNotCompressible();
// postconditions 2)
assert(best_ph.overlap_overhead > 0);
// postconditions 2)
assert(best_ph.overlap_overhead > 0);
}
// convenience
buildLoader(&best_ft);
@@ -1508,10 +1512,11 @@ void Packer::compressWithFilters(upx_bytep i_ptr, unsigned i_len,
void Packer::compressWithFilters(Filter *ft,
const unsigned overlap_range,
const upx_compress_config_t *cconf,
int filter_strategy)
int filter_strategy,
int inhibit_compression_check)
{
compressWithFilters(ft, overlap_range, cconf, filter_strategy,
0, 0, 0, NULL, 0);
0, 0, 0, NULL, 0, inhibit_compression_check);
}
@@ -1522,7 +1527,8 @@ void Packer::compressWithFilters(Filter *ft,
unsigned filter_off,
unsigned ibuf_off,
unsigned obuf_off,
const upx_bytep hdr_ptr, unsigned hdr_len)
const upx_bytep hdr_ptr, unsigned hdr_len,
int inhibit_compression_check)
{
ibuf.checkState(); obuf.checkState();
@@ -1538,7 +1544,8 @@ void Packer::compressWithFilters(Filter *ft,
o_ptr,
f_ptr, f_len,
hdr_ptr, hdr_len,
ft, overlap_range, cconf, filter_strategy);
ft, overlap_range, cconf, filter_strategy,
inhibit_compression_check);
ibuf.checkState(); obuf.checkState();
}