From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 13 Mar 2020 07:57:25 +0000 (+0100)
Subject: qemuDomainGetGuestInfo: don't assign NULL hostname
X-Git-Tag: v6.2.0-rc1~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=530ac288618b2f46e49f3ce86d4d89e7607ee3fe;p=thirdparty%2Flibvirt.git

qemuDomainGetGuestInfo: don't assign NULL hostname

Don't rely on error check and assign hostname only when non-NULL.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7a10f8f739..01929c2816 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -22967,14 +22967,14 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
     }
     if (supportedTypes & VIR_DOMAIN_GUEST_INFO_HOSTNAME) {
         rc = qemuAgentGetHostname(agent, &hostname);
-        if (rc < 0 && !(rc == -2 && types == 0)) {
+        if (rc < 0 && !(rc == -2 && types == 0))
             goto exitagent;
-        } else {
-            if (virTypedParamsAddString(params, nparams, &maxparams, "hostname",
-                                        hostname) < 0)
-                goto exitagent;
-        }
     }
+
+    if (hostname &&
+        virTypedParamsAddString(params, nparams, &maxparams, "hostname", hostname) < 0)
+        goto exitagent;
+
     if (supportedTypes & VIR_DOMAIN_GUEST_INFO_FILESYSTEM) {
         rc = qemuAgentGetFSInfo(agent, &agentfsinfo);
         if (rc < 0) {