From e78ac461dbefb7c4a3e9fde78d50fbc56b7b0183 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Mon, 28 Sep 2015 17:12:35 -0700 Subject: [PATCH] FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/" --- ext/phar/dirstream.c | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 ext/phar/tests/bug70433.phpt create mode 100755 ext/phar/tests/bug70433.zip Index: php5-5.3.3.1/ext/phar/dirstream.c =================================================================== --- php5-5.3.3.1.orig/ext/phar/dirstream.c 2015-10-18 19:47:56.000000000 +0200 +++ php5-5.3.3.1/ext/phar/dirstream.c 2015-10-18 19:49:04.000000000 +0200 @@ -211,7 +211,7 @@ zend_hash_internal_pointer_reset(manifest); while (FAILURE != zend_hash_has_more_elements(manifest)) { - if (HASH_KEY_NON_EXISTANT == zend_hash_get_current_key_ex(manifest, &key, &keylen, &unused, 0, NULL)) { + if (HASH_KEY_IS_STRING != zend_hash_get_current_key_ex(manifest, &key, &keylen, &unused, 0, NULL)) { break; }