From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 16 Apr 2014 08:33:25 +0000 (+0400)
Subject: Fixed reference counting
X-Git-Tag: POST_PHPNG_MERGE~412^2~84^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f65090a38c07d351d8bfef2a8167086067c8a21;p=php

Fixed reference counting
---

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)) {