From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43520)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Wxhu7-0003Xa-Co
	for qemu-devel@nongnu.org; Thu, 19 Jun 2014 15:21:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Wxhu1-0001YB-8A
	for qemu-devel@nongnu.org; Thu, 19 Jun 2014 15:21:47 -0400
Received: from mx1.redhat.com ([209.132.183.28]:55308)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Wxhu0-0001Wn-Uv
	for qemu-devel@nongnu.org; Thu, 19 Jun 2014 15:21:41 -0400
Received: from int-mx13.intmail.prod.int.phx2.redhat.com
	(int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5JJLeOa014367
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=OK)
	for <qemu-devel@nongnu.org>; Thu, 19 Jun 2014 15:21:40 -0400
Date: Thu, 19 Jun 2014 10:59:22 -0400
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20140619105922.1093bc36@redhat.com>
In-Reply-To: <1402647182-27592-1-git-send-email-pbonzini@redhat.com>
References: <1402647182-27592-1-git-send-email-pbonzini@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] json-lexer: fix escaped backslash in
 single-quoted string
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org, armbru@redhat.com

On Fri, 13 Jun 2014 10:13:02 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> This made the lexer wait for a closing *double* quote.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Applied to the qmp branch, thanks.

> ---
>  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 },
>          {}
>      };
>