com php-src: fix bug #67865: NEWS ext/zlib/zlib_filter.c

From: Date: Thu, 21 Aug 2014 20:41:36 +0000
Subject: com php-src: fix bug #67865: NEWS ext/zlib/zlib_filter.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80684@lists.php.net to get a copy of this message
Commit: 54fbbded372b771cf281a73e1981cde642107924 Author: Michael Wallner <mike@php.net> Thu, 21 Aug 2014 22:41:36 +0200 Parents: 9185cfd53960336ca3b041342a9ac5efeebf3a14 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=54fbbded372b771cf281a73e1981cde642107924 Log: fix bug #67865 Bugs: https://bugs.php.net/67865 Changed paths: M NEWS M ext/zlib/zlib_filter.c Diff: diff --git a/NEWS b/NEWS index ac71d9b..a34be3a 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 47a68e2..9458d68 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);

« previous php.cvs (#80684) next »