denuvo-ref/precomp-cpp
1
0
Fork 0
mirror of https://github.com/schnaader/precomp-cpp synced 2026-08-23 00:23:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed incorrect bzip2 -v output

Browse source 
Compressed size of bzip2 streams was incorrectly printed as -1
This commit is contained in:
Christian Schneider 2018-02-23 15:56:37 +01:00
parent 27053a43bc
commit 2f48166bb5
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
precomp.cpp
View file

@ -3059,7 +3059,7 @@ void zerr(int ret)
}
}
int inf_bzip2(FILE *source, FILE *dest) {
int inf_bzip2(FILE *source, FILE *dest, long long& compressed_stream_size, long long& decompressed_stream_size) {
int ret;
unsigned have;
bz_stream strm;
@ -3073,10 +3073,15 @@ int inf_bzip2(FILE *source, FILE *dest) {
if (ret != BZ_OK)
return ret;
compressed_stream_size = 0;
decompressed_stream_size = 0;
int avail_in_before;
do {
print_work_sign(true);
strm.avail_in = own_fread(in, 1, CHUNK, source);
avail_in_before = strm.avail_in;
if (ferror(source)) {
(void)BZ2_bzDecompressEnd(&strm);
@ -3096,11 +3101,15 @@ int inf_bzip2(FILE *source, FILE *dest) {
return ret;
}
compressed_stream_size += (avail_in_before - strm.avail_in);
avail_in_before = strm.avail_in;
have = CHUNK - strm.avail_out;
if (own_fwrite(out, 1, have, dest) != have || ferror(dest)) {
(void)BZ2_bzDecompressEnd(&strm);
return BZ_DATA_ERROR;
}
decompressed_stream_size += have;
} while (strm.avail_out == 0);
@ -6005,7 +6014,7 @@ long long try_to_decompress(FILE* file, int windowbits, long long& compressed_st
}
long long try_to_decompress_bzip2(FILE* file, int compression_level, long long& compressed_stream_size) {
long long r;
long long r, decompressed_stream_size;
print_work_sign(true);
@ -6018,12 +6027,8 @@ long long try_to_decompress_bzip2(FILE* file, int compression_level, long long&
seek_64(file, 0);
}
r = inf_bzip2(file, ftempout);
if (r == Z_OK) {
fseek(ftempout, 0, SEEK_END);
r = ftell(ftempout);
}
safe_fclose(&ftempout);
r = inf_bzip2(file, ftempout, compressed_stream_size, decompressed_stream_size);
if (r == Z_OK) return decompressed_stream_size;
return r;
}

2
precomp.h
View file

@ -17,7 +17,7 @@ void denit_decompress();
void denit();
bool intense_mode_is_active();
bool brute_mode_is_active();
int inf_bzip2(FILE *source, FILE *dest);
int inf_bzip2(FILE *source, FILE *dest, long long& compressed_stream_size, long long& decompressed_stream_size);
int def_bzip2(FILE *source, FILE *dest, int level);
long long file_recompress(FILE* origfile, int compression_level, int windowbits, int memlevel, long long& decompressed_bytes_used, long long decomp_bytes_total, bool in_memory);
long long file_recompress_bzip2(FILE* origfile, int level, long long& decompressed_bytes_used, long long& decompressed_bytes_total);