hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19393 from asgerf/js/json-extractor-trailing-commas2

Browse Source 
JS: Tolerate trailing commas in JSON objects
This commit is contained in:
Asger F
2025-04-29 09:40:38 +02:00
committed by GitHub
parent 966b7463ee 152d6f3c29
commit 6e64a22579
3 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
javascript/extractor/src/com/semmle/js/parser/JSONParser.java
View File

@@ -152,9 +152,6 @@ public class JSONParser {
char c = next();
switch (c) {
case '}':
if (!needsComma) {
raise("Trailing commas are not allowed in JSON.");
}
break out;
case ',':
if (!needsComma) {

6
javascript/extractor/tests/json/input/object-trailing-comma.json Normal file
View File

@@ -0,0 +1,6 @@
{
"object": {
"foo": 1,
"bar": 2,
}
}

35
javascript/extractor/tests/json/output/trap/object-trailing-comma.json.trap Normal file
View File

@@ -0,0 +1,35 @@
#10000=@"/object-trailing-comma.json;sourcefile"
files(#10000,"/object-trailing-comma.json")
#10001=@"/;folder"
folders(#10001,"/")
containerparent(#10001,#10000)
#10002=@"loc,{#10000},0,0,0,0"
locations_default(#10002,#10000,0,0,0,0)
hasLocation(#10000,#10002)
#20000=*
json(#20000,5,#10000,0,"{\n "" ... }\n}")
#20001=@"loc,{#10000},1,1,6,1"
locations_default(#20001,#10000,1,1,6,1)
json_locations(#20000,#20001)
#20002=*
json(#20002,5,#20000,0,"{\n ... ,\n }")
#20003=@"loc,{#10000},2,15,5,5"
locations_default(#20003,#10000,2,15,5,5)
json_locations(#20002,#20003)
#20004=*
json(#20004,2,#20002,0,"1")
#20005=@"loc,{#10000},3,16,3,16"
locations_default(#20005,#10000,3,16,3,16)
json_locations(#20004,#20005)
json_literals("1","1",#20004)
json_properties(#20002,"foo",#20004)
#20006=*
json(#20006,2,#20002,1,"2")
#20007=@"loc,{#10000},4,16,4,16"
locations_default(#20007,#10000,4,16,4,16)
json_locations(#20006,#20007)
json_literals("2","2",#20006)
json_properties(#20002,"bar",#20006)
json_properties(#20000,"object",#20002)
numlines(#10000,6,0,0)
filetype(#10000,"json")