From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=47124 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Py9Sl-00061v-AY
	for qemu-devel@nongnu.org; Fri, 11 Mar 2011 16:01:33 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <aliguori@us.ibm.com>) id 1Py9Sk-0008Pu-GK
	for qemu-devel@nongnu.org; Fri, 11 Mar 2011 16:01:31 -0500
Received: from e36.co.us.ibm.com ([32.97.110.154]:35489)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <aliguori@us.ibm.com>) id 1Py9Sk-0008O5-53
	for qemu-devel@nongnu.org; Fri, 11 Mar 2011 16:01:30 -0500
Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com
	[9.17.195.107])
	by e36.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p2BKu5jq027170
	for <qemu-devel@nongnu.org>; Fri, 11 Mar 2011 13:56:05 -0700
Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170])
	by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id
	p2BL1B52098240
	for <qemu-devel@nongnu.org>; Fri, 11 Mar 2011 14:01:13 -0700
Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1])
	by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP
	id p2BL1AEC009461
	for <qemu-devel@nongnu.org>; Fri, 11 Mar 2011 14:01:10 -0700
From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 11 Mar 2011 15:00:46 -0600
Message-Id: <1299877249-13433-9-git-send-email-aliguori@us.ibm.com>
In-Reply-To: <1299877249-13433-1-git-send-email-aliguori@us.ibm.com>
References: <1299877249-13433-1-git-send-email-aliguori@us.ibm.com>
Subject: [Qemu-devel] [PATCH 08/11] json-lexer: reset the lexer state on an
	invalid token
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>, Anthony Liguori <aliguori@us.ibm.com>, Markus Armbruster <armbru@redhat.com>, Michael D Roth <mdroth@us.ibm.com>, Luiz Capitulino <lcapitulino@redhat.com>

Not everything handles errors from json parsing gracefully.  By at least
resetting the lexer, we'll start generating valid tokens again and hopefully
recover the stream.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/json-lexer.c b/json-lexer.c
index c736f42..834d7af 100644
--- a/json-lexer.c
+++ b/json-lexer.c
@@ -303,6 +303,9 @@ static int json_lexer_feed_char(JSONLexer *lexer, char ch)
             new_state = IN_START;
             break;
         case ERROR:
+            QDECREF(lexer->token);
+            lexer->token = qstring_new();
+            new_state = IN_START;
             return -EINVAL;
         default:
             break;
-- 
1.7.0.4