com php-src: Fixed conversion of empty packed array into hash: Zend/zend_hash.c
| From: | Dmitry Stogov | Date: | Thu, 14 Aug 2014 09:44:37 +0000 |
| Subject: | com php-src: Fixed conversion of empty packed array into hash: Zend/zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79858@lists.php.net to get a copy of this message | ||
Commit: 2ece977c80da2fd1395fcf3f00314111ac587254
Author: Dmitry Stogov <dmitry@zend.com> Thu, 14 Aug 2014 13:44:37 +0400
Parents: 25bda5ae3caa6fe3f7d36ca2f8ee0d3070bf2f67
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2ece977c80da2fd1395fcf3f00314111ac587254
Log:
Fixed conversion of empty packed array into hash
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index e7aa255..78b38f7 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -214,6 +214,7 @@ static zend_always_inline Bucket *zend_hash_str_find_bucket(const HashTable *ht,
nIndex = h & ht->nTableMask;
idx = ht->arHash[nIndex];
while (idx != INVALID_IDX) {
+ ZEND_ASSERT(idx < ht->nTableSize);
p = ht->arData + idx;
if ((p->h == h)
&& p->key
@@ -235,6 +236,7 @@ static zend_always_inline Bucket *zend_hash_index_find_bucket(const HashTable *h
nIndex = h & ht->nTableMask;
idx = ht->arHash[nIndex];
while (idx != INVALID_IDX) {
+ ZEND_ASSERT(idx < ht->nTableSize);
p = ht->arData + idx;
if (p->h == h && !p->key) {
return p;
@@ -579,6 +581,9 @@ ZEND_API int zend_hash_rehash(HashTable *ht)
IS_CONSISTENT(ht);
if (UNEXPECTED(ht->nNumOfElements == 0)) {
+ if (ht->nTableMask) {
+ memset(ht->arHash, INVALID_IDX, ht->nTableSize * sizeof(zend_uint));
+ }
return SUCCESS;
}