Don't overwrite iterator count during real init

diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 5358f0d7d0cb3010870f65f81b2925682da085b3..e4024d9688a036d6b78b48fbed8661eaf69439b5 100644 (file)
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -129,7 +129,8 @@ static zend_always_inline void zend_hash_real_init_packed_ex(HashTable *ht)
                data = emalloc(HT_SIZE_EX(ht->nTableSize, HT_MIN_MASK));
        }
        HT_SET_DATA_ADDR(ht, data);
-       HT_FLAGS(ht) = HASH_FLAG_PACKED | HASH_FLAG_STATIC_KEYS;
+       /* Don't overwrite iterator count. */
+       ht->u.v.flags = HASH_FLAG_PACKED | HASH_FLAG_STATIC_KEYS;
        HT_HASH_RESET_PACKED(ht);
 }
 
@@ -144,7 +145,8 @@ static zend_always_inline void zend_hash_real_init_mixed_ex(HashTable *ht)
                data = emalloc(HT_SIZE_EX(HT_MIN_SIZE, HT_SIZE_TO_MASK(HT_MIN_SIZE)));
                ht->nTableMask = HT_SIZE_TO_MASK(HT_MIN_SIZE);
                HT_SET_DATA_ADDR(ht, data);
-               HT_FLAGS(ht) = HASH_FLAG_STATIC_KEYS;
+               /* Don't overwrite iterator count. */
+               ht->u.v.flags = HASH_FLAG_STATIC_KEYS;
 #ifdef __SSE2__
                do {
                        __m128i xmm0 = _mm_setzero_si128();