From 3948d83795d68d665b8b969c08b6c40498eb2661 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 29 Oct 2007 22:23:07 +0000 Subject: More sanity checks for objects Add a check for commas after complex data types inside object members. --- json-glib/json-parser.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'json-glib/json-parser.c') diff --git a/json-glib/json-parser.c b/json-glib/json-parser.c index e8aed72..4b89db1 100644 --- a/json-glib/json-parser.c +++ b/json-glib/json-parser.c @@ -600,6 +600,9 @@ json_parse_object (JsonParser *parser, if (token == G_TOKEN_RIGHT_CURLY) break; + if (token != G_TOKEN_COMMA) + return G_TOKEN_RIGHT_CURLY; + continue; } @@ -632,9 +635,12 @@ json_parse_object (JsonParser *parser, g_free (name); token = g_scanner_get_next_token (scanner); - if (token == G_TOKEN_RIGHT_BRACE) + if (token == G_TOKEN_RIGHT_CURLY) break; + if (token != G_TOKEN_COMMA) + return G_TOKEN_RIGHT_CURLY; + continue; } -- cgit v1.2.1