diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-01 23:56:45 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-01 23:56:45 +0400 |
| commit | 60961bba3d0799564dc5570719802bf12df1ce97 (patch) | |
| tree | 8779f56b0668e1b05b9d22916a5fd28b5b8c5b00 | |
| parent | dccd97d347c9dea6a43201ea002f5e74e845a831 (diff) | |
| download | php-git-60961bba3d0799564dc5570719802bf12df1ce97.tar.gz | |
Avoid useless memset()
| -rw-r--r-- | Zend/zend_hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index fe64a33b34..59d9cedbc0 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(); } |