com php-src: Avoid useless memset(): Zend/zend_hash.c

From: Date: Tue, 01 Apr 2014 19:56:45 +0000
Subject: com php-src: Avoid useless memset(): Zend/zend_hash.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77498@lists.php.net to get a copy of this message
Commit: 60961bba3d0799564dc5570719802bf12df1ce97 Author: Dmitry Stogov <dmitry@zend.com> Tue, 1 Apr 2014 23:56:45 +0400 Parents: dccd97d347c9dea6a43201ea002f5e74e845a831 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=60961bba3d0799564dc5570719802bf12df1ce97 Log: Avoid useless memset() Changed paths: M Zend/zend_hash.c Diff: diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index fe64a33..59d9ced 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -86,7 +86,7 @@ static void zend_hash_do_resize(HashTable *ht); if (packed) { \ (ht)->flags |= HASH_FLAG_PACKED; \ } else { \ - (ht)->arHash = (zend_uint*) pecalloc((ht)->nTableSize, sizeof(zend_uint), (ht)->flags & HASH_FLAG_PERSISTENT); \ + (ht)->arHash = (zend_uint*) safe_pemalloc((ht)->nTableSize, sizeof(zend_uint), 0, (ht)->flags & HASH_FLAG_PERSISTENT); \ memset((ht)->arHash, INVALID_IDX, (ht)->nTableSize * sizeof(zend_uint)); \ } \ (ht)->nTableMask = (ht)->nTableSize - 1; \ @@ -149,7 +149,7 @@ ZEND_API void zend_hash_packed_to_hash(HashTable *ht) { HANDLE_BLOCK_INTERRUPTIONS(); ht->flags &= ~HASH_FLAG_PACKED; - ht->arHash = (zend_uint*) pecalloc(ht->nTableSize, sizeof(zend_uint), ht->flags & HASH_FLAG_PERSISTENT); + ht->arHash = (zend_uint*) safe_pemalloc(ht->nTableSize, sizeof(zend_uint), 0, ht->flags & HASH_FLAG_PERSISTENT); zend_hash_rehash(ht); HANDLE_UNBLOCK_INTERRUPTIONS(); }

« previous php.cvs (#77498) next »