From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxiBy-0004Xs-LT for qemu-devel@nongnu.org; Thu, 19 Jun 2014 15:40:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxiBp-0007f6-2X for qemu-devel@nongnu.org; Thu, 19 Jun 2014 15:40:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxiBo-0007e7-Py for qemu-devel@nongnu.org; Thu, 19 Jun 2014 15:40:05 -0400 From: Luiz Capitulino Date: Thu, 19 Jun 2014 15:39:16 -0400 Message-Id: <1403206792-15387-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1403206792-15387-1-git-send-email-lcapitulino@redhat.com> References: <1403206792-15387-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PULL 04/40] json-lexer: fix escaped backslash in single-quoted string List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws From: Paolo Bonzini This made the lexer wait for a closing *double* quote. Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Reviewed-by: Amos Kong Signed-off-by: Luiz Capitulino --- qobject/json-lexer.c | 4 ++-- tests/check-qjson.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c index 440df60..b19623e 100644 --- a/qobject/json-lexer.c +++ b/qobject/json-lexer.c @@ -138,8 +138,8 @@ static const uint8_t json_lexer[][256] = { ['n'] = IN_SQ_STRING, ['r'] = IN_SQ_STRING, ['t'] = IN_SQ_STRING, - ['/'] = IN_DQ_STRING, - ['\\'] = IN_DQ_STRING, + ['/'] = IN_SQ_STRING, + ['\\'] = IN_SQ_STRING, ['\''] = IN_SQ_STRING, ['\"'] = IN_SQ_STRING, ['u'] = IN_SQ_UCODE0, diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 4e74548..95497a0 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -45,6 +45,13 @@ static void escaped_string(void) { "\"single byte utf-8 \\u0020\"", "single byte utf-8 ", .skip = 1 }, { "\"double byte utf-8 \\u00A2\"", "double byte utf-8 \xc2\xa2" }, { "\"triple byte utf-8 \\u20AC\"", "triple byte utf-8 \xe2\x82\xac" }, + { "'\\b'", "\b", .skip = 1 }, + { "'\\f'", "\f", .skip = 1 }, + { "'\\n'", "\n", .skip = 1 }, + { "'\\r'", "\r", .skip = 1 }, + { "'\\t'", "\t", .skip = 1 }, + { "'\\/'", "/", .skip = 1 }, + { "'\\\\'", "\\", .skip = 1 }, {} }; -- 1.9.3