com php-src: Initialize ht->nTableMask: Zend/zend_hash.c
| From: | Dmitry Stogov | Date: | Thu, 15 Jan 2015 12:21:38 +0000 |
| Subject: | com php-src: Initialize ht->nTableMask: Zend/zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84108@lists.php.net to get a copy of this message | ||
Commit: 989daeb5bb0d4efe39c42e98a2741c2f178bb411
Author: Dmitry Stogov <dmitry@zend.com> Thu, 15 Jan 2015 15:21:38 +0300
Parents: 9aac41753b2478fbba69a89332b77f62d142f35c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=989daeb5bb0d4efe39c42e98a2741c2f178bb411
Log:
Initialize ht->nTableMask
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index cea8739..31d2557 100644
--- a/Zend/zend_hash..c
+++ b/Zend/zend_hash.c
@@ -158,6 +158,7 @@ ZEND_API void zend_hash_packed_to_hash(HashTable *ht)
{
HANDLE_BLOCK_INTERRUPTIONS();
ht->u.flags &= ~HASH_FLAG_PACKED;
+ ht->nTableMask = ht->nTableSize - 1;
ht->arData = (Bucket *) safe_perealloc(ht->arData, ht->nTableSize, sizeof(Bucket) +
sizeof(uint32_t), 0, ht->u.flags & HASH_FLAG_PERSISTENT);
ht->arHash = (uint32_t*)(ht->arData + ht->nTableSize);
zend_hash_rehash(ht);