fix core dump when key wasn’t string. (#23)

* fix core dump when key wasn’t string. * add test code
swoole · Dec 26, 2023 · 5177330 · 5177330
1 parent 23d143f
commit 5177330
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/bridge/core.cc b/src/bridge/core.cc
@@ -248,7 +248,7 @@ static void dict2array(PyObject *pv, zval *zv) {
         py2php_fn(value, &item);
 
         ssize_t len;
-        const char *key = phpy::python::string2utf8(next, &len);
+        const char *key = phpy::python::string2utf8(PyObject_Str(next), &len);
         add_assoc_zval_ex(zv, key, len, &item);
     }
     Py_DECREF(iter);

diff --git a/tests/phpunit/DictTest.php b/tests/phpunit/DictTest.php
@@ -61,4 +61,16 @@ public function testIterInt()
         }
         $this->assertEquals($keys, array_keys($map));
     }
+
+    public function testKeyNotString()
+    {
+        $pycode = <<<CODE
+key1 = ("sum", "数量")
+key2 = ("mean", "数量")
+dict_data = {key1: 1, key2: 2}
+CODE;
+        $json = json_encode(PyCore::scalar(PyCore::eval($pycode)->dict_data));
+        $result = "{\"('sum', '\u6570\u91cf')\":1,\"('mean', '\u6570\u91cf')\":2}";
+        $this->assertEquals($json, $result);
+    }
 }