Browse Source

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>
Kevin Wolf 15 years ago
parent
commit
d758d90fe1
1 changed files with 1 additions and 1 deletions
  1. 1 1
      json-parser.c

+ 1 - 1
json-parser.c

@@ -264,7 +264,7 @@ static int parse_pair(JSONParserContext *ctxt, QDict *dict, QList **tokens, va_l
 
 
     peek = qlist_peek(working);
     peek = qlist_peek(working);
     key = parse_value(ctxt, &working, ap);
     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");
         parse_error(ctxt, peek, "key is not a string in object");
         goto out;
         goto out;
     }
     }