Fixed COUNT_RECURSIVE reference handling

13 years ago · 3203c65c7c
1 changed files with 3 additions and 0 deletions
--- 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--;
 			}