From e7b50a8ee9ca7c07fe9ed6fd457a3df1ca71d319 Mon Sep 17 00:00:00 2001 From: Tjerk Meesters Date: Tue, 13 May 2014 09:42:12 +0800 Subject: [PATCH] Convert to unpacked before deleting elements Return FAILURE immediately if a string index removal is attempted. Moved condition higher up --- Zend/zend_hash.c | 4 ++++ 1 file changed, 4 insertions(+) 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; -- 2.50.1