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

Commit: 2e267bd3c7f4c58d577d7ba7ebe813b0fb17e4a6 Author: Stanislav Malyshev <stas@php.net> Mon, 28 Sep 2015 21:42:08 -0700 Parents: 51b23cd0f0b35e4748fac9ca19fb7825cf382ffd 1ddf72180a52d247db88ea42a3e35f824a8fbda1 Branches: PHP-5.6 PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2e267bd3c7f4c58d577d7ba7ebe813b0fb17e4a6 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Better fix for bug #70433 Conflicts: ext/phar/dirstream.c Bugs: https://bugs.php.net/70433 Changed paths: MM ext/phar/dirstream.c MM ext/phar/util.c MM ext/phar/zip.c Diff: diff --cc ext/phar/dirstream.c index e6926ce,75cf049..e863509 --- 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_IS_STRING != zend_hash_get_current_key_ex(manifest, &str_key, &keylen, &unused, 0, NULL)) { - if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(manifest, &key, &keylen, &unused, 0, NULL)) { ++ if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(manifest, &str_key, &keylen, &unused, 0, NULL)) { break; }