From 3203c65c7cb34df29eccd0e520efe1886946217c Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 17 Mar 2014 22:04:54 +0800 Subject: [PATCH] Fixed COUNT_RECURSIVE reference handling --- ext/standard/array.c | 3 +++ 1 file changed, 3 insertions(+) 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--; } -- 2.50.1