summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2014-03-17 22:04:54 +0800
committerXinchen Hui <laruence@gmail.com>2014-03-17 22:04:54 +0800
commit3203c65c7cb34df29eccd0e520efe1886946217c (patch)
treeb6550b47a722a8cadbe3aeff420c351a909a882a
parent77f4c9411445343192d93bdca60b0e82ec0126a5 (diff)
downloadphp-git-3203c65c7cb34df29eccd0e520efe1886946217c.tar.gz
Fixed COUNT_RECURSIVE reference handling
-rw-r--r--ext/standard/array.c3
1 files changed, 3 insertions, 0 deletions
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--;
}