diff options
| author | Marcus Boerger <helly@php.net> | 2003-06-14 11:32:30 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2003-06-14 11:32:30 +0000 |
| commit | 4eb6392519c0cc9e419c15e670131ea8dd0f4854 (patch) | |
| tree | 0190ed979f46e07b9cfd84722eec25fd714abff7 | |
| parent | 4a97e3fef67cda8aad4c8fa7ec68e27e58d04b4d (diff) | |
| download | php-git-4eb6392519c0cc9e419c15e670131ea8dd0f4854.tar.gz | |
ecalloc doesn't return NULL
| -rw-r--r-- | Zend/zend_hash.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index cfbc2049c6..08ca21ad31 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -146,14 +146,13 @@ ZEND_API int _zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunctio /* Uses ecalloc() so that Bucket* == NULL */ if (persistent) { ht->arBuckets = (Bucket **) calloc(ht->nTableSize, sizeof(Bucket *)); + if (!ht->arBuckets) { + return FAILURE; + } } else { ht->arBuckets = (Bucket **) ecalloc_rel(ht->nTableSize, sizeof(Bucket *)); } - if (!ht->arBuckets) { - return FAILURE; - } - ht->pDestructor = pDestructor; ht->pListHead = NULL; ht->pListTail = NULL; |