From patchwork Fri Mar 25 19:47:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 88420 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 9A6F9B6F88 for ; Sat, 26 Mar 2011 07:04:01 +1100 (EST) Received: from localhost ([127.0.0.1]:49066 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q3DEf-00011i-9e for incoming@patchwork.ozlabs.org; Fri, 25 Mar 2011 16:03:53 -0400 Received: from [140.186.70.92] (port=33618 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q3Czm-0008VE-Nu for qemu-devel@nongnu.org; Fri, 25 Mar 2011 15:48:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q3Czk-0006Lt-Ed for qemu-devel@nongnu.org; Fri, 25 Mar 2011 15:48:29 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:45857) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q3Czk-0006Lm-Az for qemu-devel@nongnu.org; Fri, 25 Mar 2011 15:48:28 -0400 Received: from d01dlp01.pok.ibm.com (d01dlp01.pok.ibm.com [9.56.224.56]) by e5.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p2PJN6v7010383 for ; Fri, 25 Mar 2011 15:23:06 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 39A5D38C8042 for ; Fri, 25 Mar 2011 15:48:22 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2PJmNE52080812 for ; Fri, 25 Mar 2011 15:48:23 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2PJmNIp024702 for ; Fri, 25 Mar 2011 16:48:23 -0300 Received: from localhost.localdomain (sig-9-65-252-65.mts.ibm.com [9.65.252.65]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p2PJm3t8022972; Fri, 25 Mar 2011 16:48:22 -0300 From: Michael Roth To: qemu-devel@nongnu.org Date: Fri, 25 Mar 2011 14:47:50 -0500 Message-Id: <1301082479-4058-4-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1301082479-4058-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1301082479-4058-1-git-send-email-mdroth@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.145 Cc: aliguori@linux.vnet.ibm.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, Jes.Sorensen@redhat.com Subject: [Qemu-devel] [RFC][PATCH v1 03/12] json-parser: add handling for NULL token list 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 Currently a NULL token list will crash the parser, instead we have it pass back a NULL QObject. Signed-off-by: Michael Roth --- json-parser.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/json-parser.c b/json-parser.c index 58e973b..849e215 100644 --- a/json-parser.c +++ b/json-parser.c @@ -633,9 +633,13 @@ QObject *json_parser_parse(QList *tokens, va_list *ap) QObject *json_parser_parse_err(QList *tokens, va_list *ap, Error **errp) { JSONParserContext ctxt = {}; - QList *working = qlist_copy(tokens); + QList *working; QObject *result; + if (!tokens) { + return NULL; + } + working = qlist_copy(tokens); result = parse_value(&ctxt, &working, ap); QDECREF(working);