com php-src: Fixed segfault while OOM in pack_to_hash: Zend/zend_hash.c

Commit: ded3a44cfdb5a1c52160f8f6993ea208811741f4 Author: Xinchen Hui <laruence@php.net> Thu, 13 Aug 2015 22:42:18 +0800 Parents: 69dbfa8e9f7a292880a639cad647d8ef8cf28a5c Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ded3a44cfdb5a1c52160f8f6993ea208811741f4 Log: Fixed segfault while OOM in pack_to_hash Changed paths: M Zend/zend_hash.c Diff: diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 89a5995..7eaa64b 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -191,14 +191,15 @@ ZEND_API void ZEND_FASTCALL zend_hash_real_init(HashTable *ht, zend_bool packed) ZEND_API void ZEND_FASTCALL zend_hash_packed_to_hash(HashTable *ht) { - void *old_data = HT_GET_DATA_ADDR(ht); + void *new_data, *old_data = HT_GET_DATA_ADDR(ht); Bucket *old_buckets = ht->arData; HT_ASSERT(GC_REFCOUNT(ht) == 1); HANDLE_BLOCK_INTERRUPTIONS(); ht->u.flags &= ~HASH_FLAG_PACKED; + new_data = pemalloc(HT_SIZE(ht), (ht)->u.flags & HASH_FLAG_PERSISTENT); ht->nTableMask = -ht->nTableSize; - HT_SET_DATA_ADDR(ht, pemalloc(HT_SIZE(ht), (ht)->u.flags & HASH_FLAG_PERSISTENT)); + HT_SET_DATA_ADDR(ht, new_data); memcpy(ht->arData, old_buckets, sizeof(Bucket) * ht->nNumUsed); pefree(old_data, (ht)->u.flags & HASH_FLAG_PERSISTENT); zend_hash_rehash(ht);