Remove redundant addref+dtor

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 4aa76ca11103643ebb85f7b84e7f3006722d0e9d..37c8820164a5c44505d5abfbfe1bb024a79cc1b4 100644 (file)
--- 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 8c59eb38da1efa94999ee59e80efaac1d961bf0a..a6ccc855c0ef915d4c2396c0b7f378987eb5d872 100644 (file)
--- 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) {