From patchwork Fri Jun 13 08:13:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 359442 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2A4C71400E8 for ; Fri, 13 Jun 2014 18:13:56 +1000 (EST) Received: from localhost ([::1]:57349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvMcU-0000b0-1k for incoming@patchwork.ozlabs.org; Fri, 13 Jun 2014 04:13:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvMbu-0008KF-LL for qemu-devel@nongnu.org; Fri, 13 Jun 2014 04:13:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvMbl-0006ve-Dx for qemu-devel@nongnu.org; Fri, 13 Jun 2014 04:13:18 -0400 Received: from mail-we0-x22a.google.com ([2a00:1450:400c:c03::22a]:34271) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvMbl-0006vX-6i for qemu-devel@nongnu.org; Fri, 13 Jun 2014 04:13:09 -0400 Received: by mail-we0-f170.google.com with SMTP id w61so2400952wes.1 for ; Fri, 13 Jun 2014 01:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=EqFPDMc9kTEFs96E0L6HkE2s87zATeoXW9sMERxi9es=; b=ONyB1q5nsK6t/oUoEw6IjLGSngKliVhBRE3aa0pW6hchIi1GfjMljcJwIInO4+3GDl WUiv0XX70JoXxw4//7Tp5K8hq0jbyjCTQszRcfT7FtK4RkMp7aPAmECrgsjN3MJL0WJz xSPG068K+ZZgoOI5lWJYJt3WIuw/XSQz9BW1ANvr1sGuJvhlqhKFB55nSr0bWCVTYSNu VRpFw7RLbm6gZ9Ftlv0Mr2D0AdGZKlFaroT6ncurPzW6V2CEEMvDeseWM35v0OMb050l 4wfzSJPY+7e91xFVua5a/t3XQSc9ooDD6gg34Z+UxjcQkTk+wMos38ze5s+E1jEy5b4x fTeA== X-Received: by 10.194.110.100 with SMTP id hz4mr1782552wjb.65.1402647188145; Fri, 13 Jun 2014 01:13:08 -0700 (PDT) Received: from playground.station (net-37-117-132-7.cust.vodafonedsl.it. [37.117.132.7]) by mx.google.com with ESMTPSA id f45sm10301125eem.15.2014.06.13.01.13.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jun 2014 01:13:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 13 Jun 2014 10:13:02 +0200 Message-Id: <1402647182-27592-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::22a Cc: armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH] json-lexer: fix escaped backslash in single-quoted string X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This made the lexer wait for a closing *double* quote. Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Reviewed-by: Amos Kong --- 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 }, {} };