greg/pcompress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix huge buffer (>2GB) handling in Bzip2 compress routine.

Browse source
This commit is contained in:
Moinak Ghosh 2012-07-26 21:47:33 +05:30
parent 5ad944e368
commit b586d30359
1 changed files with 84 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
bzip2_compress.c
View file

@ -29,6 +29,11 @@
#include <pcompress.h> #include <pcompress.h>
#include <allocator.h> #include <allocator.h>
/*
* Max buffer size allowed for a single bzip2 compress/decompress call.
*/
#define SINGLE_CALL_MAX (2147483648UL)
static void * static void *
slab_alloc_i(void *p, int items, int size) { slab_alloc_i(void *p, int items, int size) {
void *ptr; void *ptr;
@ -85,8 +90,12 @@ bzip2_compress(void *src, size_t srclen, void *dst, size_t *dstlen,
int level, uchar_t chdr, void *data) int level, uchar_t chdr, void *data)
{ {
bz_stream bzs; bz_stream bzs;
int ret; int ret, ending;
unsigned int _dstlen; unsigned int slen, dlen;
size_t _srclen = srclen;
size_t _dstlen = *dstlen;
uchar_t *dst1 = dst;
uchar_t *src1 = src;
bzs.bzalloc = slab_alloc_i; bzs.bzalloc = slab_alloc_i;
bzs.bzfree = slab_free; bzs.bzfree = slab_free;
@ -98,11 +107,31 @@ bzip2_compress(void *src, size_t srclen, void *dst, size_t *dstlen,
return (-1); return (-1);
} }
bzs.next_in = src; ending = 0;
bzs.avail_in = srclen; while (_srclen > 0) {
bzs.next_out = dst; if (_srclen > SINGLE_CALL_MAX) {
bzs.avail_out = *dstlen; slen = SINGLE_CALL_MAX;
} else {
slen = _srclen;
ending = 1;
}
if (_dstlen > SINGLE_CALL_MAX) {
dlen = SINGLE_CALL_MAX;
} else {
dlen = _dstlen;
}
bzs.next_in = src1;
bzs.avail_in = slen;
bzs.next_out = dst1;
bzs.avail_out = dlen;
if (!ending) {
ret = BZ2_bzCompress(&bzs, BZ_RUN);
if (ret != BZ_RUN_OK) {
BZ2_bzCompressEnd(&bzs);
return (-1);
}
} else {
ret = BZ2_bzCompress(&bzs, BZ_FINISH); ret = BZ2_bzCompress(&bzs, BZ_FINISH);
if (ret == BZ_FINISH_OK) { if (ret == BZ_FINISH_OK) {
BZ2_bzCompressEnd(&bzs); BZ2_bzCompressEnd(&bzs);
@ -110,12 +139,17 @@ bzip2_compress(void *src, size_t srclen, void *dst, size_t *dstlen,
} }
if (ret != BZ_STREAM_END) { if (ret != BZ_STREAM_END) {
BZ2_bzCompressEnd(&bzs); BZ2_bzCompressEnd(&bzs);
bzerr(ret);
return (-1); return (-1);
} }
}
dst1 += (dlen - bzs.avail_out);
_dstlen -= (dlen - bzs.avail_out);
src1 += slen;
_srclen -= slen;
}
/* normal termination */ /* normal termination */
*dstlen -= bzs.avail_out; *dstlen = *dstlen - _dstlen;
BZ2_bzCompressEnd(&bzs); BZ2_bzCompressEnd(&bzs);
return (0); return (0);
} }
@ -125,7 +159,12 @@ bzip2_decompress(void *src, size_t srclen, void *dst, size_t *dstlen,
int level, uchar_t chdr, void *data) int level, uchar_t chdr, void *data)
{ {
bz_stream bzs; bz_stream bzs;
int ret; int ret, ending;
unsigned int slen, dlen;
size_t _srclen = srclen;
size_t _dstlen = *dstlen;
uchar_t *dst1 = dst;
uchar_t *src1 = src;
bzs.bzalloc = slab_alloc_i; bzs.bzalloc = slab_alloc_i;
bzs.bzfree = slab_free; bzs.bzfree = slab_free;
@ -137,25 +176,38 @@ bzip2_decompress(void *src, size_t srclen, void *dst, size_t *dstlen,
return (-1); return (-1);
} }
bzs.next_in = (uchar_t *)src; while (_srclen > 0) {
bzs.avail_in = srclen; if (_srclen > SINGLE_CALL_MAX) {
bzs.next_out = dst; slen = SINGLE_CALL_MAX;
bzs.avail_out = *dstlen; } else {
slen = _srclen;
ending = 1;
}
if (_dstlen > SINGLE_CALL_MAX) {
dlen = SINGLE_CALL_MAX;
} else {
dlen = _dstlen;
}
bzs.next_in = src1;
bzs.avail_in = slen;
bzs.next_out = dst1;
bzs.avail_out = dlen;
ret = BZ2_bzDecompress(&bzs); ret = BZ2_bzDecompress(&bzs);
if (ret == BZ_FINISH_OK) { if (ret != BZ_OK && ret != BZ_STREAM_END) {
BZ2_bzDecompressEnd(&bzs); BZ2_bzDecompressEnd(&bzs);
bzerr(ret); bzerr(ret);
return (-1); return (-1);
} }
if (ret != BZ_STREAM_END) { dst1 += (dlen - bzs.avail_out);
BZ2_bzDecompressEnd(&bzs); _dstlen -= (dlen - bzs.avail_out);
bzerr(ret); src1 += (slen - bzs.avail_in);
return (-1); _srclen -= (slen - bzs.avail_in);
} }
/* normal termination */ /* normal termination */
*dstlen -= bzs.avail_out; *dstlen = _dstlen;
BZ2_bzDecompressEnd(&bzs); BZ2_bzDecompressEnd(&bzs);
return (0); return (0);
} }