MFH: Fixed bug #34191 (ob_gzhandler does not enforce trailing \0).

diff --git a/NEWS b/NEWS
index 0f53b3695e70bb8e6bbaa558c4a55ace2b474515..94d86a0f1512b800f4221ecf030672a9cfb4ef97 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2005, Version 4.4.1
+- Fixed bug #34191 (ob_gzhandler does not enforce trailing \0). (Ilia)
 - Fixed bug #34156 (memory usage remains elevated after memory limit is 
   reached). (Ilia)
 - Fixed bug #34148 (+,- and . not supported as parts of scheme). (Ilia)

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 8b38d955e017fd73ad3186d1a058a2dbeffc5a63..0341043d97be64b3dba0e193ea4f2f9abdc8b04d 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -717,6 +717,7 @@ static int php_do_deflate(uint str_length, Bytef **p_buffer, uint *p_buffer_len,
 
        if (do_end) {
                err = deflate(&ZLIBG(stream), Z_FINISH);
+               buffer[outlen - ZLIBG(stream).avail_out] = '\0';
        }