summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--ext/zlib/zlib_filter.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ab30d13209..70780ce068 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@ PHP NEWS
. Fixed bug #67730 (Null byte injection possible with imagexxx functions).
(CVE-2014-5120) (Ryan Mauger)
+- Zlib:
+ . Fixed bug #67865 (internal corruption phar error). Mike
+
14 Aug 2014, PHP 5.6.0 Release Candidate 4
- COM:
diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c
index 4bde5f63cd..c815008546 100644
--- a/ext/zlib/zlib_filter.c
+++ b/ext/zlib/zlib_filter.c
@@ -302,8 +302,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);