From a07ef3d19763094ab35cc009657c85bcbb9dd9ae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Aug 2013 10:41:14 +0200 Subject: [PATCH 1/3] no single-quote string in strict mode --- json_tokener.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- json-c.orig/json_tokener.c +++ json-c/json_tokener.c @@ -265,7 +265,7 @@ struct json_object* json_tokener_parse_e if ((!ADVANCE_CHAR(str, tok)) || (!PEEK_CHAR(c, tok))) goto out; } - if(c == '/') { + if(c == '/' && !(tok->flags & JSON_TOKENER_STRICT)) { printbuf_reset(tok->pb); printbuf_memappend_fast(tok->pb, &c, 1); state = json_tokener_state_comment_start; @@ -293,8 +293,13 @@ struct json_object* json_tokener_parse_e printbuf_reset(tok->pb); tok->st_pos = 0; goto redo_char; - case '"': case '\'': + if (tok->flags & JSON_TOKENER_STRICT) { + /* in STRICT mode only double-quote are allowed */ + tok->err = json_tokener_error_parse_unexpected; + goto out; + } + case '"': state = json_tokener_state_string; printbuf_reset(tok->pb); tok->quote_char = c; @@ -764,6 +769,13 @@ struct json_object* json_tokener_parse_e } /* while(POP_CHAR) */ out: + if (c && + (state == json_tokener_state_finish) && + (tok->depth == 0) && + (tok->flags & JSON_TOKENER_STRICT)) { + /* unexpected char after JSON data */ + tok->err = json_tokener_error_parse_unexpected; + } if (!c) { /* We hit an eof char (0) */ if(state != json_tokener_state_finish && saved_state != json_tokener_state_finish)