From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 29 Mar 2018 18:41:07 +0000 (+0200)
Subject: util: qemu: Don't access virJSONValue directly in virQEMUBuildCommandLineJSONRecurse
X-Git-Tag: v4.3.0-rc1~451
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66cb1fa231ac061ad267083e490f3168c3e162d4;p=thirdparty%2Flibvirt.git

util: qemu: Don't access virJSONValue directly in virQEMUBuildCommandLineJSONRecurse

Use the accessors instead.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/util/virqemu.c b/src/util/virqemu.c
index e7ea068b94..d6652262fe 100644
--- a/src/util/virqemu.c
+++ b/src/util/virqemu.c
@@ -148,6 +148,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
     struct virQEMUCommandLineJSONIteratorData data = { key, buf, arrayFunc };
     virJSONType type = virJSONValueGetType(value);
     virJSONValuePtr elem;
+    bool tmp;
     size_t i;
 
     if (!key && type != VIR_JSON_TYPE_OBJECT) {
@@ -159,16 +160,17 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
     switch (type) {
     case VIR_JSON_TYPE_STRING:
         virBufferAsprintf(buf, "%s=", key);
-        virQEMUBuildBufferEscapeComma(buf, value->data.string);
+        virQEMUBuildBufferEscapeComma(buf, virJSONValueGetString(value));
         virBufferAddLit(buf, ",");
         break;
 
     case VIR_JSON_TYPE_NUMBER:
-        virBufferAsprintf(buf, "%s=%s,", key, value->data.number);
+        virBufferAsprintf(buf, "%s=%s,", key, virJSONValueGetNumberString(value));
         break;
 
     case VIR_JSON_TYPE_BOOLEAN:
-        if (value->data.boolean)
+        virJSONValueGetBoolean(value, &tmp);
+        if (tmp)
             virBufferAsprintf(buf, "%s=yes,", key);
         else
             virBufferAsprintf(buf, "%s=no,", key);