com php-src: set initialized flag after actual initialization happened: Zend/zend_hash.c

From: Date: Mon, 01 Jun 2015 02:37:56 +0000
Subject: com php-src: set initialized flag after actual initialization happened: Zend/zend_hash.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87031@lists.php.net to get a copy of this message
Commit: 60e92a3b8489292929591f30cbc70bab453621bc Author: Stanislav Malyshev <stas@php.net> Sun, 31 May 2015 19:37:56 -0700 Parents: e0fb8c8b7f7cf85583ea38ab63a7776f29f1443b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=60e92a3b8489292929591f30cbc70bab453621bc Log: set initialized flag after actual initialization happened Changed paths: M Zend/zend_hash.c Diff: diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 75bcb21..76804b0 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -28,7 +28,7 @@ # define HT_ASSERT(c) ZEND_ASSERT(c) #else # define HT_ASSERT(c) -#endif +#endif #if ZEND_DEBUG /* @@ -125,13 +125,13 @@ static void zend_always_inline zend_hash_real_init_ex(HashTable *ht, int packed) HT_ASSERT(GC_REFCOUNT(ht) == 1); ZEND_ASSERT(!((ht)->u.flags & HASH_FLAG_INITIALIZED)); if (packed) { - (ht)->u..flags |= HASH_FLAG_INITIALIZED | HASH_FLAG_PACKED; HT_SET_DATA_ADDR(ht, pemalloc(HT_SIZE(ht), (ht)->u.flags & HASH_FLAG_PERSISTENT)); + (ht)->u.flags |= HASH_FLAG_INITIALIZED | HASH_FLAG_PACKED; HT_HASH_RESET_PACKED(ht); } else { - (ht)->u.flags |= HASH_FLAG_INITIALIZED; (ht)->nTableMask = -(ht)->nTableSize; HT_SET_DATA_ADDR(ht, pemalloc(HT_SIZE(ht), (ht)->u.flags & HASH_FLAG_PERSISTENT)); + (ht)->u.flags |= HASH_FLAG_INITIALIZED; HT_HASH_RESET(ht); } }

« previous php.cvs (#87031) next »