diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-09-28 20:45:02 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-09-28 20:45:02 -0700 |
| commit | 4c6f4863fad2a5a92cd367fb91a42afc36736ed3 (patch) | |
| tree | 90352fc75328723c656dbf2b7daef916e31041f4 /ext/phar/dirstream.c | |
| parent | e7574a5329f8392726b1cbb85041ad86a18d6763 (diff) | |
| parent | 51b23cd0f0b35e4748fac9ca19fb7825cf382ffd (diff) | |
| download | php-git-4c6f4863fad2a5a92cd367fb91a42afc36736ed3.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix memory leak
FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
Conflicts:
ext/phar/dirstream.c
Diffstat (limited to 'ext/phar/dirstream.c')
| -rw-r--r-- | ext/phar/dirstream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c index 6cb78ad692..1275c98d66 100644 --- a/ext/phar/dirstream.c +++ b/ext/phar/dirstream.c @@ -199,7 +199,7 @@ static php_stream *phar_make_dirstream(char *dir, HashTable *manifest) /* {{{ */ zend_hash_internal_pointer_reset(manifest); while (FAILURE != zend_hash_has_more_elements(manifest)) { - if (HASH_KEY_NON_EXISTENT == zend_hash_get_current_key(manifest, &str_key, &unused)) { + if (HASH_KEY_IS_STRING != zend_hash_get_current_key(manifest, &str_key, &unused)) { break; } |