From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 17 Mar 2014 14:04:54 +0000 (+0800)
Subject: Fixed COUNT_RECURSIVE reference handling
X-Git-Tag: POST_PHPNG_MERGE~412^2~288
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3203c65c7cb34df29eccd0e520efe1886946217c;p=php

Fixed COUNT_RECURSIVE reference handling
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index cbcfecc895..ce0fcad5ab 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -288,6 +288,9 @@ static int php_count_recursive(zval *array, long mode TSRMLS_DC) /* {{{ */
 				zend_hash_move_forward_ex(Z_ARRVAL_P(array), &pos)
 			) {
 				Z_ARRVAL_P(array)->nApplyCount++;
+				if (Z_TYPE_P(element) == IS_REFERENCE) {
+					element = Z_REFVAL_P(element);
+				}
 				cnt += php_count_recursive(element, COUNT_RECURSIVE TSRMLS_CC);
 				Z_ARRVAL_P(array)->nApplyCount--;
 			}