Fixed #5559, The ZendArray::to_array() function must duplicate the ma…

…p's keys.
swoole · Nov 12, 2024 · 48d7851 · 48d7851
1 parent c0ebcb1
commit 48d7851
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/ext-src/swoole_thread.cc b/ext-src/swoole_thread.cc
@@ -1046,7 +1046,7 @@ void ZendArray::to_array(zval *return_value) {
         ArrayItem *item = (ArrayItem *) tmp;
         item->fetch(&value);
         if (key) {
-            zend_hash_add(Z_ARR_P(return_value), key, &value);
+            zend_hash_str_add(Z_ARR_P(return_value), ZSTR_VAL(key), ZSTR_LEN(key), &value);
         } else {
             zend_hash_index_add(Z_ARR_P(return_value), index, &value);
         }

diff --git a/tests/swoole_thread/map2array.phpt b/tests/swoole_thread/map2array.phpt
@@ -0,0 +1,24 @@
+--TEST--
+swoole_thread: map to array
+--SKIPIF--
+<?php
+require __DIR__ . '/../include/skipif.inc';
+skip_if_nts();
+?>
+--FILE--
+<?php
+
+use Swoole\Thread\Map;
+
+require __DIR__ . '/../include/bootstrap.php';
+
+$LURDATE = new Map;
+$time = 'abc';
+$LURDATE[$time] = new Map(["saaa" => 1111]);
+$ls = $LURDATE[$time]->toArray();
+foreach ($ls as $k => $v) {
+    unset($LURDATE[$time][$k]);
+}
+unset($LURDATE[$time]);
+?>
+--EXPECTF--