From: Andrei Zmievski <andrei@php.net>
Date: Thu, 10 Jan 2002 21:31:06 +0000 (+0000)
Subject: Fix the recursive counting, it was broken for associative or non-sequential
X-Git-Tag: PRE_ISSET_PATCH~223
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ddc039d0f53dba65dc32e14732249a95bd9d1b01;p=php

Fix the recursive counting, it was broken for associative or non-sequential
arrays. Also update NEWS file.
---

diff --git a/NEWS b/NEWS
index 674ee0b0db..a4a015b2a0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,9 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 200?, Version 4.2.0-dev
-- added mb_get_info() to get internal settings of mbstring.
+- Added second parameter to count() that can be used to specify either normal
+  or recursive counting. (patch by Vlad Bosinceanu <glipy@fx.ro>)
+- Added mb_get_info() to get internal settings of mbstring.
 - Added async query functions to PostgreSQL module (Yasuo)
 - Added pg_copy_to()/pg_copy_from() for PostgreSQL module (Youichi, Yasuo)
 - Added IPv6 support in FTP extension. (Stig Venaas)
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 86331a75e8..a1daeacecd 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -230,7 +230,7 @@ PHP_FUNCTION(ksort)
 
 int php_count_recursive(zval *array, long mode)
 {
-	long cnt = 0, i;
+	long cnt = 0;
 	zval **element;
 	
 	HashTable *target_hash;
@@ -240,13 +240,16 @@ int php_count_recursive(zval *array, long mode)
 	{
 		cnt += zend_hash_num_elements(target_hash);
 		if (mode == COUNT_RECURSIVE) {
-			for(i = 0; i < zend_hash_num_elements(target_hash); i++) {
-				if (zend_hash_index_find (Z_ARRVAL_P(array), i, (void **) &element) == SUCCESS) {
-					cnt += php_count_recursive(*element, COUNT_RECURSIVE);
-				}
+			HashPosition pos;
+
+			for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(array), &pos);
+				 zend_hash_get_current_data_ex(Z_ARRVAL_P(array), (void **) &element, &pos) == SUCCESS;
+				 zend_hash_move_forward_ex(Z_ARRVAL_P(array), &pos)) {
+				cnt += php_count_recursive(*element, COUNT_RECURSIVE);
 			}
 		}
 	}
+
 	return cnt;
 }