[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/5] monitor: Fix tracepoint crash on JSON syntax err
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 5/5] monitor: Fix tracepoint crash on JSON syntax error |
Date: |
Mon, 16 Jul 2018 16:05:14 +0200 |
When tracepoint handle_qmp_command is enabled, we crash on JSON syntax
errors. Broken in commit 1cc37471525. Fix by skipping the tracepoint
on JSON syntax error. Before the flawed commit, we skipped it by
returning early.
Fixes: CID 1394216
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
---
monitor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/monitor.c b/monitor.c
index 7af1f18d13..be29634a00 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4224,7 +4224,7 @@ static void handle_qmp_command(JSONMessageParser *parser,
GQueue *tokens)
qdict_del(qdict, "id");
} /* else will fail qmp_dispatch() */
- if (trace_event_get_state_backends(TRACE_HANDLE_QMP_COMMAND)) {
+ if (req && trace_event_get_state_backends(TRACE_HANDLE_QMP_COMMAND)) {
QString *req_json = qobject_to_json(req);
trace_handle_qmp_command(mon, qstring_get_str(req_json));
qobject_unref(req_json);
--
2.17.1
- [Qemu-devel] [PULL 0/5] Miscellaneous patches for 2018-07-16 (3.0.0-rc1), Markus Armbruster, 2018/07/16
- [Qemu-devel] [PULL 4/5] MAINTAINERS: New section "Incompatible changes", copy libvir-list, Markus Armbruster, 2018/07/16
- [Qemu-devel] [PULL 1/5] qapi: Do not expose "allow-preconfig" in query-qmp-schema, Markus Armbruster, 2018/07/16
- [Qemu-devel] [PULL 2/5] cli qmp: Mark --preconfig, exit-preconfig experimental, Markus Armbruster, 2018/07/16
- [Qemu-devel] [PULL 5/5] monitor: Fix tracepoint crash on JSON syntax error,
Markus Armbruster <=
- [Qemu-devel] [PULL 3/5] qemu-doc: Move appendix "Deprecated features" to its own file, Markus Armbruster, 2018/07/16
- Re: [Qemu-devel] [PULL 0/5] Miscellaneous patches for 2018-07-16 (3.0.0-rc1), Peter Maydell, 2018/07/16