Compare commits

...
1 Commits
Author SHA1 Message Date
Stanislav Malyshev 46ee0e087e Revert "Fixed Bug #67724"
This reverts commit e4ff7f2ee3.
Reverted since it causes https://bugs.php.net/bug.php?id=67865
2014-08-20 13:15:22 -07:00
3 changed files with 1 additions and 28 deletions

No files matched your search

Binary file not shown.
-26
View File
@@ -1,26 +0,0 @@
--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
+1 -2
View File
@@ -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 = 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);