From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 28 Feb 2017 21:26:56 +0000 (+0100)
Subject: qjson: Abort earlier on qobject_from_jsonf() misuse
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ea5ef5c80b655456971b00f7ffaad5e26d4c5978;p=qemu.git

qjson: Abort earlier on qobject_from_jsonf() misuse

Ignoring errors first, then asserting success is suboptimal.  Pass
&error_abort instead, so we abort earlier, and hopefully get more
useful clues on what's wrong.

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

diff --git a/qobject/qjson.c b/qobject/qjson.c
index 339c9f7de2..c98d6a71cc 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -65,7 +65,7 @@ QObject *qobject_from_jsonf(const char *string, ...)
     va_list ap;
 
     va_start(ap, string);
-    obj = qobject_from_jsonv(string, &ap, NULL);
+    obj = qobject_from_jsonv(string, &ap, &error_abort);
     va_end(ap);
 
     assert(obj != NULL);