diff options
| author | Michael Wallner <mike@php.net> | 2014-08-21 22:44:34 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-08-21 22:45:33 +0200 |
| commit | 3b82c4e52063e74abaca637811629b521754de3d (patch) | |
| tree | 784e1184fe42e06f797192ff8de0b8a5deacdd1e | |
| parent | 76c2a9f4f47495f3db95a2f930f5b604ac105aa3 (diff) | |
| parent | c4fb183b9fd6fecf7dfb8df309bfa34ff1ec2e53 (diff) | |
| download | php-git-3b82c4e52063e74abaca637811629b521754de3d.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix bug #67865
updated NEWS to fit last release
NEWS
Fix bug #67878 program_prefix not honoured in man pages
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/zlib/zlib_filter.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -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); |