From 2f65090a38c07d351d8bfef2a8167086067c8a21 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 16 Apr 2014 12:33:25 +0400 Subject: [PATCH] Fixed reference counting --- Zend/zend_builtin_functions.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index f86b70465d..aebcb7436c 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -610,11 +610,13 @@ ZEND_FUNCTION(each) if (Z_ISREF_P(entry)) { ZVAL_DUP(&tmp, Z_REFVAL_P(entry)); entry = &tmp; + if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry); + } else { + if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry); + if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry); } zend_hash_index_update(Z_ARRVAL_P(return_value), 1, entry); - if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry); zend_hash_str_update(Z_ARRVAL_P(return_value), "value", sizeof("value")-1, entry); - if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry); /* add the key elements */ switch (zend_hash_get_current_key(target_hash, &key, &num_key, 0)) { -- 2.50.1