]> git.proxmox.com Git - mirror_qemu.git/commitdiff
monitor: Assert qmp_schema_json[] is sane
authorMarkus Armbruster <armbru@redhat.com>
Tue, 28 Feb 2017 21:27:02 +0000 (22:27 +0100)
committerMarkus Armbruster <armbru@redhat.com>
Tue, 7 Mar 2017 15:07:47 +0000 (16:07 +0100)
qmp_query_qmp_schema() parses qmp_schema_json[] with
qobject_from_json().  This must not fail, so pass &error_abort.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <1488317230-26248-17-git-send-email-armbru@redhat.com>

monitor.c

index ae6c4d3ad8eff360325df0770410b5ece67dfc14..f11893e1c3be9133f174854c4cd8d064be0bec9b 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -953,7 +953,7 @@ EventInfoList *qmp_query_events(Error **errp)
 static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
                                  Error **errp)
 {
-    *ret_data = qobject_from_json(qmp_schema_json, NULL);
+    *ret_data = qobject_from_json(qmp_schema_json, &error_abort);
 }
 
 /*