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

diff --git a/NEWS b/NEWS
index 75f52201e07b4c34757669ae4290cb3fb14c9a84..99c98d64ba1fe0d3ba7e92c69b52ea2faa8879ff 100644 (file)
--- 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 2e642b3bf851c59e7e788ade10c75096fcb366da..0536fd2de2aa512a11cd2a5f675b4fef27ca1855 100644 (file)
--- 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;
                        }
                }
        }