diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-01-13 16:33:37 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-01-13 16:33:37 -0800 |
| commit | 635ba1f2c3555d1c5c9a974b581083fd199dbc80 (patch) | |
| tree | 1ac98bfe4b20e8263a4be675127dea2f904003ef | |
| parent | aa8d3a8cc612ba87c0497275f58a2317a90fb1c4 (diff) | |
| parent | 13ad4d3e971807f9a58ab5933182907dc2958539 (diff) | |
| download | php-git-635ba1f2c3555d1c5c9a974b581083fd199dbc80.tar.gz | |
Merge branch 'bug71354' into PHP-5.5.32
* bug71354:
Fix bug #71354 - remove UMR when size is 0
| -rw-r--r-- | ext/phar/phar_object.c | 1 | ||||
| -rw-r--r-- | ext/phar/tests/bug71354.phpt | 13 | ||||
| -rw-r--r-- | ext/phar/tests/bug71354.tar | bin | 0 -> 1536 bytes |
3 files changed, 14 insertions, 0 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 6d25509cdf..e21a9829e3 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -4884,6 +4884,7 @@ PHP_METHOD(PharFileInfo, getContent) phar_seek_efp(link, 0, SEEK_SET, 0, 0 TSRMLS_CC); Z_TYPE_P(return_value) = IS_STRING; + Z_STRVAL_P(return_value) = NULL; Z_STRLEN_P(return_value) = php_stream_copy_to_mem(fp, &(Z_STRVAL_P(return_value)), link->uncompressed_filesize, 0); if (!Z_STRVAL_P(return_value)) { diff --git a/ext/phar/tests/bug71354.phpt b/ext/phar/tests/bug71354.phpt new file mode 100644 index 0000000000..43230f1520 --- /dev/null +++ b/ext/phar/tests/bug71354.phpt @@ -0,0 +1,13 @@ +--TEST-- +Phar: bug #71354: Heap corruption in tar/zip/phar parser. +--SKIPIF-- +<?php if (!extension_loaded("phar")) die("skip"); ?> +--FILE-- +<?php +$p = new PharData(__DIR__."/bug71354.tar"); +var_dump($p['aaaa']->getContent()); +?> +DONE +--EXPECT-- +string(0) "" +DONE
\ No newline at end of file diff --git a/ext/phar/tests/bug71354.tar b/ext/phar/tests/bug71354.tar Binary files differnew file mode 100644 index 0000000000..b0bd992b9e --- /dev/null +++ b/ext/phar/tests/bug71354.tar |