]> granicus.if.org Git - php/commitdiff
ecalloc doesn't return NULL
authorMarcus Boerger <helly@php.net>
Sat, 14 Jun 2003 11:32:30 +0000 (11:32 +0000)
committerMarcus Boerger <helly@php.net>
Sat, 14 Jun 2003 11:32:30 +0000 (11:32 +0000)
Zend/zend_hash.c

index cfbc2049c6b992dc929a4d677534f447d4ba66eb..08ca21ad3147229d8188395b0a21e118146ca011 100644 (file)
@@ -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;