tony2001 Tue Apr 12 10:01:06 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/standard array.c
Log:
MFH: fix #30833 (array_count_values modifying input array)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.319&r2=1.1760.2.320&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.319 php-src/NEWS:1.1760.2.320
--- php-src/NEWS:1.1760.2.319 Mon Apr 11 06:41:33 2005
+++ php-src/NEWS Tue Apr 12 10:01:01 2005
@@ -20,6 +20,7 @@
- Fixed bug #31502 (Wrong deserialization from session when using WDDX
serializer). (Dmitry)
- Fixed bug #31363 (broken non-blocking flock()). ian at snork dot net
+- Fixed bug #30833 (array_count_values() modifying input array). (Tony)
- Fixed bug #28839 (SIGSEGV in interactive mode (php -a)).
(kameshj at fastmail dot fm)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.15&r2=1.266.2.16&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.15
php-src/ext/standard/array.c:1.266.2.16
--- php-src/ext/standard/array.c:1.266.2.15 Sat Mar 12 05:12:49 2005
+++ php-src/ext/standard/array.c Tue Apr 12 10:01:06 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.266.2.15 2005/03/12 10:12:49 andrey Exp $ */
+/* $Id: array.c,v 1.266.2.16 2005/04/12 14:01:06 tony2001 Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2443,7 +2443,6 @@
zend_hash_internal_pointer_reset_ex(myht, &pos);
while (zend_hash_get_current_data_ex(myht, (void **)&entry, &pos) ==
SUCCESS) {
if (Z_TYPE_PP(entry) == IS_LONG) {
-int_key:
if (zend_hash_index_find(Z_ARRVAL_P(return_value),
Z_LVAL_PP(entry),
(void**)&tmp) == FAILURE) {
@@ -2458,9 +2457,28 @@
} 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) {
- SEPARATE_ZVAL(entry);
- convert_to_long_ex(entry);
- goto int_key;
+ 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_hash_find(Z_ARRVAL_P(return_value),
Z_STRVAL_PP(entry), Z_STRLEN_PP(entry)+1, (void**)&tmp) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
