mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 10:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

far better fix for bug #40189

Browse Source
This commit is contained in:
Greg Beaver 2008-01-12 22:03:32 +00:00
parent 79abe24b1b
commit 4f17800e32
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ext/bz2/bz2_filter.c
View File

@ -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);

13
ext/zlib/zlib_filter.c
View File

@ -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,13 +108,10 @@ 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);