From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 24 Feb 2010 15:17:58 +0000 (+0100)
Subject: json-parser: Fix segfault on malformed input
X-Git-Tag: v0.12.4~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9462695b64ef628e94d7f670feecdaa125ff5f52;p=thirdparty%2Fqemu.git

json-parser: Fix segfault on malformed input

If the parser fails to parse the key in parse_pair, it will access a NULL
pointer. A simple way to trigger this is sending {foo} via QMP. This patch
turns the segfault into a syntax error reply.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
(cherry picked from commit d758d90fe1f74a46042fca665036a23b4d5fe87d)
---

diff --git a/json-parser.c b/json-parser.c
index 2ab6f6c11b6..3497cd365fc 100644
--- a/json-parser.c
+++ b/json-parser.c
@@ -266,7 +266,7 @@ static int parse_pair(JSONParserContext *ctxt, QDict *dict, QList **tokens, va_l
 
     peek = qlist_peek(working);
     key = parse_value(ctxt, &working, ap);
-    if (qobject_type(key) != QTYPE_QSTRING) {
+    if (!key || qobject_type(key) != QTYPE_QSTRING) {
         parse_error(ctxt, peek, "key is not a string in object");
         goto out;
     }