Fix Object.values/entries for numeric keys after 2v18 regression (fix #…

…2375)
espruino · Jun 5, 2023 · 2b4caff · 2b4caff
1 parent c0bed8d
commit 2b4caff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,4 @@
-     2v19 : 
+     2v19 : Fix Object.values/entries for numeric keys after 2v18 regression (fix #2375)
 
      2v18 : Fix drawString with setClipRect with 90/270-degree rotation (fix #2343)
             Pico/Wifi: Enabled JIT compiler

diff --git a/src/jswrap_object.c b/src/jswrap_object.c
@@ -333,14 +333,18 @@ Return all enumerable keys and values of the given object
  */
 void _jswrap_object_values_cb(void *data, JsVar *name) {
   JsVar **cbData = (JsVar**)data;
-  jsvArrayPushAndUnLock(cbData[0], jspGetVarNamedField(cbData[1], name, false));
+  JsVar *field = jsvAsArrayIndex(name);
+  jsvArrayPushAndUnLock(cbData[0], jspGetVarNamedField(cbData[1], field, false));
+  jsvUnLock(field);
 }
 void _jswrap_object_entries_cb(void *data, JsVar *name) {
   JsVar **cbData = (JsVar**)data;
   JsVar *tuple = jsvNewEmptyArray();
   if (!tuple) return;
   jsvArrayPush(tuple, name);
-  jsvArrayPushAndUnLock(tuple, jspGetVarNamedField(cbData[1], name, false));
+  JsVar *field = jsvAsArrayIndex(name);
+  jsvArrayPushAndUnLock(tuple, jspGetVarNamedField(cbData[1], field, false));
+  jsvUnLock(field);
   jsvArrayPushAndUnLock(cbData[0], tuple);
 }
 JsVar *jswrap_object_values_or_entries(JsVar *object, bool returnEntries) {