MFB: Fixed bug #38464 (array_count_values() mishandles numeric strings).

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 2bc47aace58dad5072a3f8fa5b6aca399e1b4613..96b9c33957842c205d44196674e7220bf065529f 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2571,48 +2571,18 @@ PHP_FUNCTION(array_count_values)
                                                                         (void**)&tmp) == FAILURE) {
                                zval *data;
                                MAKE_STD_ZVAL(data);
-                               Z_TYPE_P(data) = IS_LONG;
-                               Z_LVAL_P(data) = 1;
+                               ZVAL_LONG(data, 1);
                                zend_hash_index_update(Z_ARRVAL_P(return_value), Z_LVAL_PP(entry), &data, sizeof(data), NULL);
                        } else {
                                Z_LVAL_PP(tmp)++;
                        }
                } else if (Z_TYPE_PP(entry) == IS_STRING ||
                           Z_TYPE_PP(entry) == IS_UNICODE) {
-                       /* make sure our array does not end up with numeric string keys 
-                        * but don't touch those strings that start with 0 */
-                       if ((Z_TYPE_PP(entry) == IS_STRING && !(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) ||
-                           (Z_TYPE_PP(entry) == IS_UNICODE && zend_cmp_unicode_and_literal(Z_USTRVAL_PP(entry), 1, "0", sizeof("0")-1) && is_numeric_unicode(Z_USTRVAL_PP(entry), Z_USTRLEN_PP(entry), NULL, NULL, 0) == IS_LONG)) {
-                               zval tmp_entry;
-                               
-                               tmp_entry = **entry;
-                               zval_copy_ctor(&tmp_entry);
-
-                               convert_to_long(&tmp_entry);
-
-                               if (zend_hash_index_find(Z_ARRVAL_P(return_value), 
-                                                                                Z_LVAL(tmp_entry), 
-                                                                                (void**)&tmp) == FAILURE) {
-                                       zval *data;
-                                       MAKE_STD_ZVAL(data);
-                                       Z_TYPE_P(data) = IS_LONG;
-                                       Z_LVAL_P(data) = 1;
-                                       zend_hash_index_update(Z_ARRVAL_P(return_value), Z_LVAL(tmp_entry), &data, sizeof(data), NULL);
-                               } else {
-                                       Z_LVAL_PP(tmp)++;
-                               }
-                               
-                               zval_dtor(&tmp_entry);
-                               zend_hash_move_forward_ex(myht, &pos);
-                               continue;
-                       }
-               
-                       if (zend_u_hash_find(Z_ARRVAL_P(return_value), Z_TYPE_PP(entry), Z_UNIVAL_PP(entry), Z_UNILEN_PP(entry)+1, (void**)&tmp) == FAILURE) {
+                       if (zend_u_symtable_find(Z_ARRVAL_P(return_value), Z_TYPE_PP(entry), Z_UNIVAL_PP(entry), Z_UNILEN_PP(entry) + 1, (void**)&tmp) == FAILURE) {
                                zval *data;
                                MAKE_STD_ZVAL(data);
-                               Z_TYPE_P(data) = IS_LONG;
-                               Z_LVAL_P(data) = 1;
-                               zend_u_hash_update(Z_ARRVAL_P(return_value), Z_TYPE_PP(entry), Z_UNIVAL_PP(entry), Z_UNILEN_PP(entry) + 1, &data, sizeof(data), NULL);
+                               ZVAL_LONG(data, 1);
+                               zend_u_symtable_update(Z_ARRVAL_P(return_value), Z_TYPE_PP(entry), Z_UNIVAL_PP(entry), Z_UNILEN_PP(entry) + 1, &data, sizeof(data), NULL);
                        } else {
                                Z_LVAL_PP(tmp)++;
                        }

diff --git a/ext/standard/tests/array/bug38464.phpt b/ext/standard/tests/array/bug38464.phpt
new file mode 100644 (file)
index 0000000..42f7a6a
--- /dev/null
+++ b/ext/standard/tests/array/bug38464.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #38464 (array_count_values() mishandles numeric strings)
+--FILE--
+<?php
+$array = array('-000', ' 001', 1, ' 123', '+123');
+var_dump(array_count_values($array));
+?>
+--EXPECT--     
+array(5) {
+  ["-000"]=>
+  int(1)
+  [" 001"]=>
+  int(1)
+  [1]=>
+  int(1)
+  [" 123"]=>
+  int(1)
+  ["+123"]=>
+  int(1)
+}