From patchwork Fri Mar 11 21:00:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 86458 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 93AD0B6FA8 for ; Sat, 12 Mar 2011 08:17:57 +1100 (EST) Received: from localhost ([127.0.0.1]:50575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Py9ia-0005t3-GF for incoming@patchwork.ozlabs.org; Fri, 11 Mar 2011 16:17:52 -0500 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 ) 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 ) 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 ; 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 ; 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 ; Fri, 11 Mar 2011 14:01:10 -0700 Received: from localhost.localdomain (sig-9-65-217-31.mts.ibm.com [9.65.217.31]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p2BL0u8p008003; Fri, 11 Mar 2011 14:01:09 -0700 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Fri, 11 Mar 2011 15:00:46 -0600 Message-Id: <1299877249-13433-9-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1299877249-13433-1-git-send-email-aliguori@us.ibm.com> References: <1299877249-13433-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.154 Cc: Paolo Bonzini , Anthony Liguori , Markus Armbruster , Michael D Roth , Luiz Capitulino Subject: [Qemu-devel] [PATCH 08/11] json-lexer: reset the lexer state on an invalid token X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 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;