com php-src: Convert to unpacked before deleting elements: Zend/zend_hash.c
| From: | Xinchen Hui | Date: | Tue, 13 May 2014 03:58:28 +0000 |
| Subject: | com php-src: Convert to unpacked before deleting elements: Zend/zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78297@lists.php.net to get a copy of this message | ||
Commit: e7b50a8ee9ca7c07fe9ed6fd457a3df1ca71d319
Author: Tjerk Meesters <datibbaw@php.net> Tue, 13 May 2014 09:42:12 +0800
Parents: 9f9ee0186eb3d1fcc2b3a4ecc55a0195233fd670
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e7b50a8ee9ca7c07fe9ed6fd457a3df1ca71d319
Log:
Convert to unpacked before deleting elements
Return FAILURE immediately if a string index removal is attempted.
Moved condition higher up
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 3ffdf6e..41805a2 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;