]> granicus.if.org Git - php/commitdiff
Changed initialization order to workaround against crashes after memory overflow
authorDmitry Stogov <dmitry@php.net>
Fri, 15 Apr 2011 09:59:42 +0000 (09:59 +0000)
committerDmitry Stogov <dmitry@php.net>
Fri, 15 Apr 2011 09:59:42 +0000 (09:59 +0000)
Zend/zend_hash.c

index f073dcd1019ed1029ea546c34c8cf49eeb50db92..4ee3cdeb5ca3065f3e3894914234fea505c7bc7b 100644 (file)
@@ -138,8 +138,8 @@ ZEND_API ulong zend_hash_func(const char *arKey, uint nKeyLength)
 
 #define CHECK_INIT(ht) do {                                                                                            \
        if (UNEXPECTED((ht)->nTableMask == 0)) {                                                                \
-               (ht)->nTableMask = (ht)->nTableSize - 1;                                                \
                (ht)->arBuckets = (Bucket **) pecalloc((ht)->nTableSize, sizeof(Bucket *), (ht)->persistent);   \
+               (ht)->nTableMask = (ht)->nTableSize - 1;                                                \
        }                                                                                                                                       \
 } while (0)