diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-01 16:22:51 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-01 16:22:51 +0100 |
| commit | 26c3fa275943e0e8bf8527b7ed1b3e68eecb72a1 (patch) | |
| tree | f1bf1cd989dcca7f1605df1a2f2ec6437f54f1c9 /Zend/zend_hash.c | |
| parent | b4fbf1d381d23ad3e9ad8f6df572adc1984a0a45 (diff) | |
| parent | 5875bf754ed4fc64a6f0b7d62734d2a816c51017 (diff) | |
| download | php-git-26c3fa275943e0e8bf8527b7ed1b3e68eecb72a1.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Always remove HT iterators, even for uninit HT
Diffstat (limited to 'Zend/zend_hash.c')
| -rw-r--r-- | Zend/zend_hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 986866ee52..1f83a889e7 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -1655,10 +1655,10 @@ ZEND_API void ZEND_FASTCALL zend_array_destroy(HashTable *ht) } else if (EXPECTED(HT_FLAGS(ht) & HASH_FLAG_UNINITIALIZED)) { goto free_ht; } - zend_hash_iterators_remove(ht); SET_INCONSISTENT(HT_DESTROYED); efree(HT_GET_DATA_ADDR(ht)); free_ht: + zend_hash_iterators_remove(ht); FREE_HASHTABLE(ht); } |