From 533669f7c437e564a56fc559dbd375ac1fdc815e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 29 Apr 2020 10:27:20 +0200 Subject: [PATCH] Remove redundant addref+dtor --- Zend/zend_API.c | 2 +- ext/spl/spl_iterators.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 4aa76ca111..37c8820164 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1578,7 +1578,7 @@ ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value) /* {{{ */ result = zend_symtable_update(ht, Z_STR_P(key), value); break; case IS_NULL: - result = zend_symtable_update(ht, ZSTR_EMPTY_ALLOC(), value); + result = zend_hash_update(ht, ZSTR_EMPTY_ALLOC(), value); break; case IS_RESOURCE: zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(key), Z_RES_HANDLE_P(key)); diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 8c59eb38da..a6ccc855c0 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -2360,9 +2360,7 @@ static inline void spl_caching_it_next(spl_dual_it_object *intern) zval *data = &intern->current.data; ZVAL_DEREF(data); - Z_TRY_ADDREF_P(data); array_set_zval_key(Z_ARRVAL(intern->u.caching.zcache), key, data); - zval_ptr_dtor(data); } /* Recursion ? */ if (intern->dit_type == DIT_RecursiveCachingIterator) { -- 2.40.0