From: Antony Dovgal <tony2001@php.net>
Date: Tue, 4 Oct 2005 20:48:17 +0000 (+0000)
Subject: MFH: fix #34723 (array_count_values() strips leading zeroes)
X-Git-Tag: php-5.1.0RC2~107
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b8ecbcf54bc9601df9eb6e481901aff9bd303f0;p=php

MFH: fix #34723 (array_count_values() strips leading zeroes)
---

diff --git a/NEWS b/NEWS
index 48f9cb9c71..5671b4c435 100644
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,7 @@ PHP                                                                        NEWS
 - Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
 - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
   (Andrey)
+- Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
 - Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry)
 - Fixed bug #34645 (ctype corrupts memory when validating large numbers). (Ilia)
 - Fixed bug #34643 (wsdl default value has no effect). (Dmitry)
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 9c80587850..fd9f2af36f 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2520,8 +2520,9 @@ PHP_FUNCTION(array_count_values)
 				Z_LVAL_PP(tmp)++;
 			}
 		} else if (Z_TYPE_PP(entry) == IS_STRING) {
-			/* make sure our array does not end up with numeric string keys */
-			if (is_numeric_string(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry), NULL, NULL, 0) == IS_LONG) {
+			/* make sure our array does not end up with numeric string keys
+			 * but don't touch those strings that start with 0 */
+			if (!(Z_STRLEN_PP(entry) > 1 && Z_STRVAL_PP(entry)[0] == '0') && is_numeric_string(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry), NULL, NULL, 0) == IS_LONG) {
 				zval tmp_entry;
 				
 				tmp_entry = **entry;