From: Michael Roth <mdroth@linux.vnet.ibm.com>
Date: Wed, 1 Jun 2011 17:15:00 +0000 (-0500)
Subject: json-parser: add handling for NULL token list
X-Git-Tag: v0.15.0-rc0~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1990ebfa11265d3aa9b6a4d5d1a02bd3f9ac5c6;p=thirdparty%2Fqemu.git

json-parser: add handling for NULL token list

Currently a NULL token list will crash the parser, instead we have it
pass back a NULL QObject.

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/json-parser.c b/json-parser.c
index 58e973bc187..849e2156da4 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);