1 files changed, 9 insertions, 2 deletions

diff --git a/parser.y b/parser.y
index 9e15ca44..7e068714 100644
--- a/parser.y
+++ b/parser.y
@@ -970,13 +970,15 @@ json_val : NUMBER               { $$ = $1; }
          | '"' litchars '"'     { $$ = $2;
                                   rl($$, num(parser->lineno)); }
          | '[' ']'              { $$ = vector(zero, nil); }
-         | '[' json_vals ']'    { $$ = if3(vectorp($2),
+         | '[' json_vals
+               opt_comma ']'    { $$ = if3(vectorp($2),
                                            $2,
                                            rl(cons(vector_lit_s,
                                                    cons(nreverse($2), nil)),
                                               $2)); }
          | '{' '}'              { $$ = make_hash(hash_weak_none, t); }
-         | '{' json_pairs '}'   { $$ = if3(hashp($2),
+         | '{' json_pairs
+               opt_comma '}'    { $$ = if3(hashp($2),
                                            $2,
                                            rl(cons(hash_lit_s,
                                                    cons(nil, nreverse($2))),
@@ -1003,6 +1005,11 @@ json_val : NUMBER               { $$ = $1; }
                                   yybadtok(yychar, lit("JSON hash")); }
          ;
 
+opt_comma : ','                 { if (!parser->read_bad_json)
+                                    yyerr("trailing comma in JSON array"); }
+          |
+          ;
+
 json_vals : json_val                    { $$ = if3(parser->quasi_level > 0 &&
                                                    unquotes_occur($1, 0),
                                                    cons($1, nil),