com php-src: Fix bug #69413: ext/standard/array.c ext/standard/tests/array/bug69413.phpt

Commit: 94bea670de40c937d5926839d52dc262750921f4 Author: Nikita Popov <nikic@php.net> Fri, 10 Apr 2015 09:49:07 +0200 Parents: 858ca975c4961a8948e52578a96094a6625829ed Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94bea670de40c937d5926839d52dc262750921f4 Log: Fix bug #69413 Bugs: https://bugs.php.net/69413 Changed paths: M ext/standard/array.c A ext/standard/tests/array/bug69413.phpt Diff: diff --git a/ext/standard/array.c b/ext/standard/array.c index 311f4f2..1e35426 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -2997,6 +2997,7 @@ PHP_FUNCTION(array_count_values) /* Go through input array and add values to the return array */ myht = Z_ARRVAL_P(input); ZEND_HASH_FOREACH_VAL(myht, entry) { + ZVAL_DEREF(entry); if (Z_TYPE_P(entry) == IS_LONG) { if ((tmp = zend_hash_index_find(Z_ARRVAL_P(return_value), Z_LVAL_P(entry))) == NULL) { zval data; diff --git a/ext/standard/tests/array/bug69413.phpt b/ext/standard/tests/array/bug69413.phpt new file mode 100644 index 0000000..3a0ab8d --- /dev/null +++ b/ext/standard/tests/array/bug69413.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #69413: Warning in array_count_values() about array values not being string/int +--FILE-- +<?php + +$array = ['a', 'b']; +$ref =& $array[0]; + +var_dump(array_count_values($array)); + +?> +--EXPECT-- +array(2) { + ["a"]=> + int(1) + ["b"]=> + int(1) +}