diff options
| author | Michael Wallner <mike@php.net> | 2014-08-05 15:46:52 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-08-05 15:46:52 +0200 |
| commit | fa57c291bb681044cbc215a88580679afed7ac7c (patch) | |
| tree | 9492a52e9fbaf005ad246d56b1095522ce316a35 | |
| parent | 0ab5854863f1fee011bb0685fa47d0042d4a2392 (diff) | |
| parent | e4ff7f2ee346d641715694209e61704c9e815483 (diff) | |
| download | php-git-fa57c291bb681044cbc215a88580679afed7ac7c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed Bug #67724
| -rw-r--r-- | ext/zlib/tests/bug67724.gz.gz | bin | 0 -> 171 bytes | |||
| -rw-r--r-- | ext/zlib/tests/bug67724.phpt | 26 | ||||
| -rw-r--r-- | ext/zlib/zlib_filter.c | 3 |
3 files changed, 28 insertions, 1 deletions
diff --git a/ext/zlib/tests/bug67724.gz.gz b/ext/zlib/tests/bug67724.gz.gz Binary files differnew file mode 100644 index 0000000000..ab1db9258e --- /dev/null +++ b/ext/zlib/tests/bug67724.gz.gz diff --git a/ext/zlib/tests/bug67724.phpt b/ext/zlib/tests/bug67724.phpt new file mode 100644 index 0000000000..1e5026f650 --- /dev/null +++ b/ext/zlib/tests/bug67724.phpt @@ -0,0 +1,26 @@ +--TEST-- +Bug #67724 (chained zlib filters silently fail with large amounts of data) +--SKIPIF-- +<?php +extension_loaded("zlib") or die("skip need ext/zlib"); +?> +--FILE-- +<?php +echo "Test\n"; + +$f = fopen(__DIR__."/bug67724.gz.gz", "rb") + or die(current(error_get_last())); +stream_filter_append($f, "zlib.inflate", STREAM_FILTER_READ, ["window" => 30]); +stream_filter_append($f, "zlib.inflate", STREAM_FILTER_READ, ["window" => 30]); +for ($i = 0; !feof($f); $i += strlen(fread($f, 0x1000))) + ; +fclose($f); + +var_dump($i); + +?> +DONE +--EXPECT-- +Test +int(25600000) +DONE diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c index 9a59c3a855..4bde5f63cd 100644 --- a/ext/zlib/zlib_filter.c +++ b/ext/zlib/zlib_filter.c @@ -302,7 +302,8 @@ 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 = data->inbuf_len = 2048; + data->strm.avail_out = data->outbuf_len = 0x8000; + data->inbuf_len = 2048; 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); |