summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS9
-rw-r--r--ext/zlib/zlib_filter.c3
2 files changed, 6 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index ac71d9ba7b..a34be3a47f 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,11 @@ PHP NEWS
- Wddx:
. Fixed bug #67873 (Segfaults in php_wddx_serialize_var). (Anatol, Remi)
+- Zlib:
+ . Fixed bug #67724 (chained zlib filters silently fail with large amounts of
+ data). (Mike)
+ . Fixed bug #67865 (internal corruption phar error). (Mike)
+
?? ??? 2014, PHP 5.4.32
- COM:
@@ -66,10 +71,6 @@ PHP NEWS
. Fixed bug #60616 (odbc_fetch_into returns junk data at end of multi-byte
char fields). (Keyur)
-- Zlib:
- . Fixed bug #67724 (chained zlib filters silently fail with large amounts of
- data). (Mike)
-
- MySQLi:
. Fixed bug #67839 (mysqli does not handle 4-byte floats correctly). (Keyur)
diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c
index 47a68e264f..9458d6863e 100644
--- a/ext/zlib/zlib_filter.c
+++ b/ext/zlib/zlib_filter.c
@@ -310,8 +310,7 @@ static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *f
data->strm.zalloc = (alloc_func) php_zlib_alloc;
data->strm.zfree = (free_func) php_zlib_free;
- data->strm.avail_out = data->outbuf_len = 0x8000;
- data->inbuf_len = 2048;
+ data->strm.avail_out = data->outbuf_len = data->inbuf_len = 0x8000;
data->strm.next_in = data->inbuf = (Bytef *) pemalloc(data->inbuf_len, persistent);
if (!data->inbuf) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes", data->inbuf_len);