From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 16 Dec 2007 17:22:31 +0000 (+0000)
Subject: MFB: Fixed bug #43589 (a possible infinite loop in bz2_filter.c)
X-Git-Tag: php-5.2.6RC1~240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1643c14e5fb020a747709a0e93efced24ab4181a;p=php

MFB: Fixed bug #43589 (a possible infinite loop in bz2_filter.c)
---

diff --git a/NEWS b/NEWS
index 75f52201e0..99c98d64ba 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,9 @@ PHP                                                                        NEWS
 ?? ??? 2008, PHP 5.2.6
 - Fixed weired behavior in CGI parameter parsing. (Dmitry, Hannes Magnusson)
 
-- Fixed bug #43606 (define missing depencies of the exif extension)
+- Fixed bug #43606 (define missing depencies of the exif extension).
   (crrodriguez at suse dot de)
+- Fixed bug #43589 (a possible infinite loop in bz2_filter.c). (Greg)
 - Fixed bug #43580 (removed bogus declaration of a non-existent php_is_url()  
   function). (Ilia)
 - Fixed bug #43533 (escapeshellarg('') returns null). (Ilia)
diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c
index 2e642b3bf8..0536fd2de2 100644
--- a/ext/bz2/bz2_filter.c
+++ b/ext/bz2/bz2_filter.c
@@ -132,6 +132,8 @@ 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;
+			} else if (status == BZ_OK) {
+				break;
 			}
 		}
 	}