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

Commit: 51b23cd0f0b35e4748fac9ca19fb7825cf382ffd Author: Stanislav Malyshev <stas@php.net> Mon, 28 Sep 2015 20:44:28 -0700 Parents: f39a4ee0c971177bc873d282c39ee1b670652f5c f98ab19dc0c978e3caaa2614579e4a61f2c317f5 Branches: PHP-5.6 PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=51b23cd0f0b35e4748fac9ca19fb7825cf382ffd 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: MM ext/phar/dirstream.c MM ext/phar/util.c Diff: diff --cc ext/phar/dirstream.c index e863509,4728e29..e6926ce --- a/ext/phar/dirstream..c +++ b/ext/phar/dirstream.c @@@ -198,7 -207,7 +198,7 @@@ static php_stream *phar_make_dirstream( 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, &key, &keylen, &unused, 0, NULL)) { ++ if (HASH_KEY_IS_STRING != zend_hash_get_current_key_ex(manifest, &str_key, &keylen, &unused, 0, NULL)) { break; }