summaryrefslogtreecommitdiff
path: root/ext/bz2
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2007-01-25 12:22:21 +0000
committerAntony Dovgal <tony2001@php.net>2007-01-25 12:22:21 +0000
commit0bc0e57b855c7b8c3919fd2cb944b13ea0565d48 (patch)
treef55c09d7240af8ff73661895b889de1f32e081f2 /ext/bz2
parentde3c2038af4870a340c770c56511c4f239128999 (diff)
downloadphp-git-0bc0e57b855c7b8c3919fd2cb944b13ea0565d48.tar.gz
MFH: fix #40189 (possible endless loop in zlib.inflate stream filter)
Diffstat (limited to 'ext/bz2')
-rw-r--r--ext/bz2/bz2_filter.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c
index 9cdd5f019f..e29346e567 100644
--- a/ext/bz2/bz2_filter.c
+++ b/ext/bz2/bz2_filter.c
@@ -101,6 +101,11 @@ static php_stream_filter_status_t php_bz2_decompress_filter(
consumed += desired;
bin += desired;
+ if (!desired) {
+ flags |= PSFS_FLAG_FLUSH_CLOSE;
+ break;
+ }
+
if (data->strm.avail_out < data->outbuf_len) {
php_stream_bucket *out_bucket;
size_t bucketlen = data->outbuf_len - data->strm.avail_out;