com php-src: Fix bug #71354 - remove UMR when size is 0: ext/phar/phar_object.c ext/phar/tests/bug71354 .phpt ext/phar/tests/bug71354.tar

From: Date: Thu, 14 Jan 2016 00:32:29 +0000
Subject: com php-src: Fix bug #71354 - remove UMR when size is 0: ext/phar/phar_object.c ext/phar/tests/bug71354 .phpt ext/phar/tests/bug71354.tar
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90866@lists.php.net to get a copy of this message
Commit: 13ad4d3e971807f9a58ab5933182907dc2958539 Author: Stanislav Malyshev <stas@php.net> Wed, 13 Jan 2016 16:32:29 -0800 Parents: 74dcbe12997132353fd75d0c14548cff5235329f Branches: PHP-5.5 PHP-5.5.32 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=13ad4d3e971807f9a58ab5933182907dc2958539 Log: Fix bug #71354 - remove UMR when size is 0 Bugs: https://bugs.php.net/71354 Changed paths: M ext/phar/phar_object.c A ext/phar/tests/bug71354.phpt A ext/phar/tests/bug71354.tar Diff: diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 6d25509..e21a982 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 0000000..43230f1 --- /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 new file mode 100644 index 0000000..b0bd992 Binary files /dev/null and b/ext/phar/tests/bug71354.tar differ

« previous php.cvs (#90866) next »