From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:39440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBpyx-0006iO-Q8 for qemu-devel@nongnu.org; Mon, 18 Apr 2011 11:03:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QBpyw-0000ol-KN for qemu-devel@nongnu.org; Mon, 18 Apr 2011 11:03:19 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:59666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBpyw-0000oJ-DO for qemu-devel@nongnu.org; Mon, 18 Apr 2011 11:03:18 -0400 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e33.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p3IEuOJ9005658 for ; Mon, 18 Apr 2011 08:56:25 -0600 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 p3IF34o0036298 for ; Mon, 18 Apr 2011 09:03:05 -0600 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 p3IF33RS021398 for ; Mon, 18 Apr 2011 09:03:04 -0600 From: Michael Roth Date: Mon, 18 Apr 2011 10:02:19 -0500 Message-Id: <1303138953-1334-4-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1303138953-1334-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1303138953-1334-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC][PATCH v2 03/17] json-parser: add handling for NULL token list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@linux.vnet.ibm.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, Jes.Sorensen@redhat.com 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); -- 1.7.0.4