From 1d28516b79fd3e582a1a6e1529a83bb127a5a1ee Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Sat, 12 Jan 2008 22:04:03 +0000 Subject: [PATCH] MFH: far better fix for bug #40189 --- ext/bz2/bz2_filter.c | 13 +++++-------- ext/zlib/zlib_filter.c | 14 ++++++-------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c index c8fc59ef2f..5c986fc5a8 100644 --- a/ext/bz2/bz2_filter.c +++ b/ext/bz2/bz2_filter.c @@ -101,7 +101,7 @@ static php_stream_filter_status_t php_bz2_decompress_filter( consumed += desired; bin += desired; - if (status == BZ_STREAM_END || data->strm.avail_out < data->outbuf_len) { + if (data->strm.avail_out < data->outbuf_len) { php_stream_bucket *out_bucket; size_t bucketlen = data->outbuf_len - data->strm.avail_out; out_bucket = php_stream_bucket_new(stream, estrndup(data->outbuf, bucketlen), bucketlen, 1, 0 TSRMLS_CC); @@ -109,13 +109,10 @@ static php_stream_filter_status_t php_bz2_decompress_filter( data->strm.avail_out = data->outbuf_len; data->strm.next_out = data->outbuf; exit_status = PSFS_PASS_ON; - if (status == BZ_STREAM_END) { - /* no more data to decompress, and nothing was spat out */ - if (data->strm.avail_out >= data->outbuf_len) { - php_stream_bucket_delref(bucket TSRMLS_CC); - } - return PSFS_PASS_ON; - } + } else if (status == BZ_STREAM_END && data->strm.avail_out >= data->outbuf_len) { + /* no more data to decompress, and nothing was spat out */ + php_stream_bucket_delref(bucket TSRMLS_CC); + return PSFS_PASS_ON; } } php_stream_bucket_delref(bucket TSRMLS_CC); diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c index 80359498ec..789d22fcb8 100644 --- a/ext/zlib/zlib_filter.c +++ b/ext/zlib/zlib_filter.c @@ -100,7 +100,7 @@ static php_stream_filter_status_t php_zlib_inflate_filter( consumed += desired; bin += desired; - if (status == Z_STREAM_END || data->strm.avail_out < data->outbuf_len) { + if (data->strm.avail_out < data->outbuf_len) { php_stream_bucket *out_bucket; size_t bucketlen = data->outbuf_len - data->strm.avail_out; out_bucket = php_stream_bucket_new(stream, estrndup(data->outbuf, bucketlen), bucketlen, 1, 0 TSRMLS_CC); @@ -108,14 +108,12 @@ static php_stream_filter_status_t php_zlib_inflate_filter( data->strm.avail_out = data->outbuf_len; data->strm.next_out = data->outbuf; exit_status = PSFS_PASS_ON; - if (status == Z_STREAM_END) { - /* no more data to decompress, and nothing was spat out */ - if (data->strm.avail_out >= data->outbuf_len) { - php_stream_bucket_delref(bucket TSRMLS_CC); - } - return PSFS_PASS_ON; - } + } else if (status == Z_STREAM_END && data->strm.avail_out >= data->outbuf_len) { + /* no more data to decompress, and nothing was spat out */ + php_stream_bucket_delref(bucket TSRMLS_CC); + return PSFS_PASS_ON; } + } php_stream_bucket_delref(bucket TSRMLS_CC); } -- 2.40.0