diff options
author | Stanislav Malyshev <stas@php.net> | 2015-09-28 21:42:08 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-09-28 21:42:08 -0700 |
commit | 2e267bd3c7f4c58d577d7ba7ebe813b0fb17e4a6 (patch) | |
tree | c4bfcc6dc29bf30dccee116f68ea083f7b3c6857 | |
parent | 51b23cd0f0b35e4748fac9ca19fb7825cf382ffd (diff) | |
parent | 1ddf72180a52d247db88ea42a3e35f824a8fbda1 (diff) | |
download | php-git-2e267bd3c7f4c58d577d7ba7ebe813b0fb17e4a6.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Better fix for bug #70433
Conflicts:
ext/phar/dirstream.c
-rw-r--r-- | ext/phar/dirstream.c | 2 | ||||
-rw-r--r-- | ext/phar/util.c | 2 | ||||
-rw-r--r-- | ext/phar/zip.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c index e6926ce154..e863509b6c 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_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, &str_key, &keylen, &unused, 0, NULL)) { break; } diff --git a/ext/phar/util.c b/ext/phar/util.c index 461cbf91f1..da5a6c1278 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1970,7 +1970,7 @@ void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, int filename while ((s = zend_memrchr(filename, '/', filename_len))) { filename_len = s - filename; - if (FAILURE == zend_hash_add_empty_element(&phar->virtual_dirs, filename, filename_len)) { + if (!filename_len || FAILURE == zend_hash_add_empty_element(&phar->virtual_dirs, filename, filename_len)) { break; } } diff --git a/ext/phar/zip.c b/ext/phar/zip.c index 222011af4d..f1126a024c 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -396,7 +396,9 @@ foundit: if (entry.filename[entry.filename_len - 1] == '/') { entry.is_dir = 1; - entry.filename_len--; + if(entry.filename_len > 1) { + entry.filename_len--; + } entry.flags |= PHAR_ENT_PERM_DEF_DIR; } else { entry.is_dir = 0; |