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

Commit: d6e8426ebf10214f750b33c37fa5df0e909b919b Author: Stanislav Malyshev <stas@php.net> Mon, 28 Sep 2015 21:43:16 -0700 Parents: 4c6f4863fad2a5a92cd367fb91a42afc36736ed3 2e267bd3c7f4c58d577d7ba7ebe813b0fb17e4a6 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d6e8426ebf10214f750b33c37fa5df0e909b919b Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Better fix for bug #70433 Conflicts: ext/phar/dirstream.c ext/phar/util.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 1275c98,e863509..6cb78ad --- a/ext/phar/dirstream.c +++ b/ext/phar/dirstream.c @@@ -199,7 -198,7 +199,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(manifest, &str_key, &unused)) { - if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key_ex(manifest, &str_key, &keylen, &unused, 0, NULL)) { ++ if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key(manifest, &str_key, &unused)) { break; } diff --cc ext/phar/util.c index f2f422e,da5a6c1..8da8ecc --- a/ext/phar/util.c +++ b/ext/phar/util.c @@@ -1929,7 -1970,7 +1929,7 @@@ void phar_add_virtual_dirs(phar_archive while ((s = zend_memrchr(filename, '/', filename_len))) { filename_len = s - filename; - if (NULL == zend_hash_str_add_empty_element(&phar->virtual_dirs, filename, filename_len)) { - if (!filename_len || FAILURE == zend_hash_add_empty_element(&phar->virtual_dirs, filename, filename_len)) { ++ if (!filename_len || NULL == zend_hash_str_add_empty_element(&phar->virtual_dirs, filename, filename_len)) { break; } }