falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 d758d90fe1)
This commit is contained in:
Kevin Wolf 2010-02-24 16:17:58 +01:00 committed by Aurelien Jarno
parent 5eb089588e
commit 9462695b64
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
json-parser.c
View File

@ -266,7 +266,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;
} }