Storage.readJSON will now read numeric field names like "{1:1}" which…

… can be produced by writeJSON (fix #2484)
espruino · Apr 15, 2024 · b251d83 · b251d83
1 parent 0325da0
commit b251d83
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -23,6 +23,7 @@
             Graphics: Fix wrapString when attempting to wrap text containing an image that's too large for the wrappable area (fix #2481)
             Add String.replaceAll to allow all occurrances of a string to be replaced (previously .replace(/substr/g, "") had to be used)
             Jolt.js: Jolt.Q0/1/2/3 now available as global vars (Q0/1/2/3)
+            Storage.readJSON will now read numeric field names like "{1:1}" which can be produced by writeJSON (fix #2484)
 
      2v21 : nRF52: free up 800b more flash by removing vector table padding
             Throw Exception when a Promise tries to resolve with another Promise (#2450)

diff --git a/src/jswrap_json.c b/src/jswrap_json.c
@@ -137,8 +137,8 @@ JsVar *jswrap_json_parse_internal(JSONFlags flags) {
   case '{': {
     JsVar *obj = jsvNewObject(); if (!obj) return 0;
     jslGetNextToken(); // {
-    while ((lex->tk == LEX_STR || jslIsIDOrReservedWord()) && !jspHasError()) {
-      if (!(flags&JSON_DROP_QUOTES) && jslIsIDOrReservedWord()) {
+    while ((lex->tk == LEX_STR || lex->tk == LEX_INT || jslIsIDOrReservedWord()) && !jspHasError()) {
+      if (!(flags&JSON_DROP_QUOTES) && (jslIsIDOrReservedWord() || lex->tk == LEX_INT)) {
 	      jslMatch(LEX_STR);
         return obj;
       }