Skip to content

Commit

Permalink
JSON.parse(): bail if we don't get a string key (in non-relaxed mode)
Browse files Browse the repository at this point in the history
  • Loading branch information
bobrippling committed Nov 27, 2023
1 parent 693bd55 commit 6619532
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/jswrap_json.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ JsVar *jswrap_json_parse_internal(JSONFlags flags) {
JsVar *obj = jsvNewObject(); if (!obj) return 0;
jslGetNextToken(); // {
while ((lex->tk == LEX_STR || lex->tk == LEX_ID) && !jspHasError()) {
if (!(flags&JSON_DROP_QUOTES)) {
jslMatch(LEX_STR);
return obj;
if (!(flags&JSON_DROP_QUOTES) && !jslMatch(LEX_STR)) {
jsvUnLock(obj);
return 0;
}
JsVar *key = jsvAsArrayIndexAndUnLock(jslGetTokenValueAsVar());
jslGetNextToken();
Expand Down
23 changes: 22 additions & 1 deletion tests/test_json_object.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
// JSON shouldn't print stuff like __proto__ and constructor

function A() {}
function A() {}
var a = new A();

result = JSON.stringify(a)=="{}";

function assertEq(got, expected) {
if (typeof got !== typeof expected)
throw new Error("mismatch, " + typeof a + " != " + typeof b);

if (typeof got === "object")
// note: doesn't check keys in `got`
for (var k in expected)
assertEq(got[k], expected[k]);
else if (got !== expected)
throw new Error("mismatch, " + got + " != " + expected);
}

// no exceptions thrown:
assertEq(JSON.parse('{"a": 1}'), {"a": 1});
assertEq(JSON.parse('["4", 5, "six"]'), ["4", 5, "six"]);
assertEq(JSON.parse('["4", 5, "six", {"x": 5}]'), ["4", 5, "six", {"x": 5}]);
assertEq(JSON.parse('""'), "");
assertEq(JSON.parse('5'), 5);
assertEq(JSON.parse('[]'), []);
assertEq(JSON.parse('{}'), {});

0 comments on commit 6619532

Please sign in to comment.