Fix bug #69413

2 files changed, 19 insertions, 0 deletions

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 311f4f272d..1e354266a1 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 0000000000..3a0ab8d046
--- /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)
+}