com php-src: Fixed malloc/emalloc mess: Zend/zend_hash.c
| From: | Dmitry Stogov | Date: | Thu, 15 Jan 2015 15:05:58 +0000 |
| Subject: | com php-src: Fixed malloc/emalloc mess: Zend/zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84110@lists.php.net to get a copy of this message | ||
Commit: 34723d1b75cb6b9a686c6643ac194e86c0c95f74
Author: Dmitry Stogov <dmitry@zend.com> Thu, 15 Jan 2015 18:05:58 +0300
Parents: 27efc2b2ce1b7b59939c276e26d4e31307d98b88
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=34723d1b75cb6b9a686c6643ac194e86c0c95f74
Log:
Fixed malloc/emalloc mess
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 31d2557..2546106 100644
--- a/Zend/zend_hash..c
+++ b/Zend/zend_hash.c
@@ -170,7 +170,7 @@ ZEND_API void zend_hash_to_packed(HashTable *ht)
HANDLE_BLOCK_INTERRUPTIONS();
ht->u.flags |= HASH_FLAG_PACKED;
ht->nTableMask = 0;
- ht->arData = erealloc(ht->arData, ht->nTableSize * sizeof(Bucket));
+ ht->arData = (Bucket *) perealloc(ht->arData, ht->nTableSize * sizeof(Bucket),
ht->u.flags & HASH_FLAG_PERSISTENT);
ht->arHash = (uint32_t*)&uninitialized_bucket;
HANDLE_UNBLOCK_INTERRUPTIONS();
}
@@ -1754,7 +1754,7 @@ ZEND_API int zend_hash_sort_ex(HashTable *ht, sort_func_t sort, compare_func_t
c
if (renumber) {
ht->u.flags |= HASH_FLAG_PACKED;
ht->nTableMask = 0;
- ht->arData = erealloc(ht->arData, ht->nTableSize * sizeof(Bucket));
+ ht->arData = perealloc(ht->arData, ht->nTableSize * sizeof(Bucket), ht->u.flags
& HASH_FLAG_PERSISTENT);
ht->arHash = (uint32_t*)&uninitialized_bucket;
} else {
zend_hash_rehash(ht);