stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

zlib: fix error on partial compression of files. Fixes #1902.

Browse source 
This occurs where compressing small, already compressd files, typically images.

I could avoid compression of very small (or already compressed) files. But its
simple to keep things uniform and fixing this makes sense anyway!
This commit is contained in:
Adam Sutton 2014-01-01 12:48:39 +00:00
parent 688e0bef1f
commit 4d5c8a9ae2
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/filebundle.c
View file

@ -127,12 +127,25 @@ static uint8_t *_fb_deflate ( const uint8_t *data, size_t orig, size_t *size )
zstr.next_out = bufout;
/* Decompress */
err = deflate(&zstr, Z_FINISH);
if ( (err != Z_STREAM_END && err != Z_OK) || zstr.total_out == 0 ) {
free(bufout);
bufout = NULL;
} else {
*size = zstr.total_out;
while (1) {
err = deflate(&zstr, Z_FINISH);
/* Need more space */
if (err == Z_OK && zstr.avail_out == 0) {
bufout = realloc(bufout, zstr.total_out * 2);
zstr.avail_out = zstr.total_out;
zstr.next_out = bufout + zstr.total_out;
continue;
}
/* Error */
if ( (err != Z_STREAM_END && err != Z_OK) || zstr.total_out == 0 ) {
free(bufout);
bufout = NULL;
} else {
*size = zstr.total_out;
}
break;
}
free(bufin);
deflateEnd(&zstr);