com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/phar/dirstream.c ext/phar/tests/bug70433.phpt ext/phar/tests/bug70433.zip ext/phar/util.c

Commit: 752e4c6c07aee71dbb6f277cc41a417e025e9f9e Author: Stanislav Malyshev <stas@php.net> Mon, 28 Sep 2015 20:44:28 -0700 Committer: Ferenc Kovacs <tyrael@php.net> Wed, 30 Sep 2015 01:31:53 +0200 Parents: 791a49ac7ad24dfab83bde7730bffd4a4354c8df Branches: PHP-5.6.14 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=752e4c6c07aee71dbb6f277cc41a417e025e9f9e Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: fix memory leak FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/" Conflicts: ext/phar/dirstream.c Bugs: https://bugs.php.net/70433 Changed paths: M ext/phar/dirstream.c A ext/phar/tests/bug70433.phpt A ext/phar/tests/bug70433.zip M ext/phar/util.c Diff: diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c index e863509..e6926ce 100644 --- a/ext/phar/dirstream.c +++ b/ext/phar/dirstream.c @@ -198,7 +198,7 @@ static php_stream *phar_make_dirstream(char *dir, HashTable *manifest TSRMLS_DC) zend_hash_internal_pointer_reset(manifest); while (FAILURE != zend_hash_has_more_elements(manifest)) { - if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(manifest, &str_key, &keylen, &unused, 0, NULL)) { + if (HASH_KEY_IS_STRING != zend_hash_get_current_key_ex(manifest, &str_key, &keylen, &unused, 0, NULL)) { break; } diff --git a/ext/phar/tests/bug70433.phpt b/ext/phar/tests/bug70433.phpt new file mode 100644 index 0000000..cbebb34 --- /dev/null +++ b/ext/phar/tests/bug70433.phpt @@ -0,0 +1,23 @@ +--TEST-- +Phar - bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/" +--SKIPIF-- +<?php if (!extension_loaded("phar")) die("skip"); ?> +--FILE-- +<?php +$phar = new PharData(__DIR__."/bug70433.zip"); +var_dump($phar); +$meta = $phar->getMetadata(); +var_dump($meta); +?> +DONE +--EXPECTF-- +object(PharData)#1 (3) { + ["pathName":"SplFileInfo":private]=> + string(0) "" + ["glob":"DirectoryIterator":private]=> + bool(false) + ["subPathName":"RecursiveDirectoryIterator":private]=> + string(0) "" +} +NULL +DONE diff --git a/ext/phar/tests/bug70433..zip b/ext/phar/tests/bug70433.zip new file mode 100755 index 0000000..3994a30 Binary files /dev/null and b/ext/phar/tests/bug70433.zip differ diff --git a/ext/phar/util.c b/ext/phar/util.c index fb3c8be..461cbf9 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -496,6 +496,7 @@ really_get_entry: if (entry->link) { phar_entry_info *link = phar_get_link_source(entry TSRMLS_CC); if(!link) { + efree(*ret); return FAILURE; } (*ret)->zero = phar_get_fp_offset(link TSRMLS_CC);