* [Qemu-devel] [PATCH] json-parser: Fix segfault on malformed input
@ 2010-02-24 15:17 Kevin Wolf
2010-03-06 21:48 ` Aurelien Jarno
0 siblings, 1 reply; 2+ messages in thread
From: Kevin Wolf @ 2010-02-24 15:17 UTC (permalink / raw)
To: qemu-devel
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>
---
json-parser.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/json-parser.c b/json-parser.c
index f3debcb..579928f 100644
--- a/json-parser.c
+++ b/json-parser.c
@@ -264,7 +264,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;
}
--
1.6.6.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH] json-parser: Fix segfault on malformed input
2010-02-24 15:17 [Qemu-devel] [PATCH] json-parser: Fix segfault on malformed input Kevin Wolf
@ 2010-03-06 21:48 ` Aurelien Jarno
0 siblings, 0 replies; 2+ messages in thread
From: Aurelien Jarno @ 2010-03-06 21:48 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-devel
On Wed, Feb 24, 2010 at 04:17:58PM +0100, Kevin Wolf wrote:
> 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>
Thanks, applied.
> ---
> json-parser.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/json-parser.c b/json-parser.c
> index f3debcb..579928f 100644
> --- a/json-parser.c
> +++ b/json-parser.c
> @@ -264,7 +264,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;
> }
> --
> 1.6.6.1
>
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-06 21:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-24 15:17 [Qemu-devel] [PATCH] json-parser: Fix segfault on malformed input Kevin Wolf
2010-03-06 21:48 ` Aurelien Jarno
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).