[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [STABLE][PATCH 01/10] json-parser: Fix segfault on malforme
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [STABLE][PATCH 01/10] json-parser: Fix segfault on malformed input |
Date: |
Fri, 9 Apr 2010 11:46:19 +0200 |
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 <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
(cherry picked from commit d758d90fe1f74a46042fca665036a23b4d5fe87d)
---
json-parser.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/json-parser.c b/json-parser.c
index 2ab6f6c..3497cd3 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;
}
--
1.6.6.1
- [Qemu-devel] [STABLE][PULL 00/10] Patches for 0.12.4, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 01/10] json-parser: Fix segfault on malformed input,
Kevin Wolf <=
- [Qemu-devel] [STABLE][PATCH 02/10] block: avoid creating too large iovecs in multiwrite_merge, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 05/10] scsi-disk: fix buffer overflow, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 06/10] block: Fix multiwrite error handling, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 03/10] qcow2: Factor next_refcount_table_size out, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 04/10] qcow2: Rewrite alloc_refcount_block/grow_refcount_table, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 10/10] qcow2: Remove request from in-flight list after error, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 09/10] qcow2: Don't ignore immediate read/write failures, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 08/10] block: Fix multiwrite memory leak in error case, Kevin Wolf, 2010/04/09
- [Qemu-devel] [STABLE][PATCH 07/10] block: Fix error code in multiwrite for immediate failures, Kevin Wolf, 2010/04/09
- Re: [Qemu-devel] [STABLE][PULL 00/10] Patches for 0.12.4, Aurelien Jarno, 2010/04/09