summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--ext/zlib/zlib.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index dbbf42e7e9..5431eff8d6 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ PHP NEWS
- Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
+- 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 d195597b13..ff68743ccd 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -644,6 +644,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';
}
*p_buffer = buffer;