diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-04-16 18:08:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-04-16 18:08:08 +0800 |
| commit | ce49e6b0f73d9d8b51bd85d40abb5008a496f700 (patch) | |
| tree | ef047eae18ffb76e808bd2d552b72eaad832dd83 /Zend/zend_builtin_functions.c | |
| parent | a16a6eae2400ca27900507a44801645a4b6b3927 (diff) | |
| parent | 78f428d3a825acae74a975747f25cd6782606633 (diff) | |
| download | php-git-ce49e6b0f73d9d8b51bd85d40abb5008a496f700.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 6 |
1 files 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)) { |