From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRyOq-0005Mh-B8 for qemu-devel@nongnu.org; Wed, 01 Jun 2011 23:16:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QRyOo-00077w-Rz for qemu-devel@nongnu.org; Wed, 01 Jun 2011 23:16:43 -0400 Received: from mout.perfora.net ([74.208.4.194]:65164) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRp43-00081I-Mc for qemu-devel@nongnu.org; Wed, 01 Jun 2011 13:18:40 -0400 From: Michael Roth Date: Wed, 1 Jun 2011 12:15:00 -0500 Message-Id: <1306948500-15086-15-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1306948500-15086-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1306948500-15086-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v1][ 14/14] 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, Jes.Sorensen@redhat.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, lcapitulino@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