From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 2 Apr 2019 21:59:38 +0000 (+0200)
Subject: virJSONValueToString: bail out early on error
X-Git-Tag: v5.3.0-rc1~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f01a34f04c70cbe9aa6d2ed5577ba70d2ec27d2a;p=thirdparty%2Flibvirt.git

virJSONValueToString: bail out early on error

Now that we do not need to cater to YAJL 1, move the check for the
return value of yajl_gen_alloc earlier, so that we can assume it
was successful in later code.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/util/virjson.c b/src/util/virjson.c
index 857ee23951..bb4052ba81 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -1941,16 +1941,14 @@ virJSONValueToBuffer(virJSONValuePtr object,
     VIR_DEBUG("object=%p", object);
 
     g = yajl_gen_alloc(NULL);
-    if (g) {
-        yajl_gen_config(g, yajl_gen_beautify, pretty ? 1 : 0);
-        yajl_gen_config(g, yajl_gen_indent_string, pretty ? "  " : " ");
-        yajl_gen_config(g, yajl_gen_validate_utf8, 1);
-    }
     if (!g) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Unable to create JSON formatter"));
         goto cleanup;
     }
+    yajl_gen_config(g, yajl_gen_beautify, pretty ? 1 : 0);
+    yajl_gen_config(g, yajl_gen_indent_string, pretty ? "  " : " ");
+    yajl_gen_config(g, yajl_gen_validate_utf8, 1);
 
     if (virJSONValueToStringOne(object, g) < 0) {
         virReportOOMError();