From: Tjerk Meesters <datibbaw@php.net>
Date: Tue, 13 May 2014 01:42:12 +0000 (+0800)
Subject: Convert to unpacked before deleting elements
X-Git-Tag: POST_PHPNG_MERGE~380^2~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7b50a8ee9ca7c07fe9ed6fd457a3df1ca71d319;p=php

Convert to unpacked before deleting elements

Return FAILURE immediately if a string index removal is attempted.

Moved condition higher up
---

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 3ffdf6ef76..41805a2f92 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -675,6 +675,10 @@ ZEND_API int zend_hash_str_del(HashTable *ht, const char *str, int len)
 
 	IS_CONSISTENT(ht);
 
+	if (ht->u.flags & HASH_FLAG_PACKED) {
+		return FAILURE;
+	}
+
 	h = zend_inline_hash_func(str, len);
 	nIndex = h & ht->nTableMask;