From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 28 Aug 2018 10:53:25 +0000 (+0200)
Subject: qemu: initialize variables in qemuParseCommandLine
X-Git-Tag: v4.7.0-rc2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea119118fc9e477aaafa1968449c0ffd22d7d84c;p=thirdparty%2Flibvirt.git

qemu: initialize variables in qemuParseCommandLine

Commit 6700062 introduced a jump to error which skipped the
initialization of def:

qemu/qemu_parse_command.c:1870:9: error: variable 'def' is
used uninitialized whenever 'if' condition is true
      [-Werror,-Wsometimes-uninitialized]
    if (!(qemuCaps = virQEMUCapsCacheLookup(capsCache, progargv[0])))

Initialize def to fix this warning and qemuCaps, to prevent
a future error like this.

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

diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index c0bf27f800..5b4a378a18 100644
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -1838,7 +1838,7 @@ qemuParseCommandLine(virFileCachePtr capsCache,
                      virDomainChrSourceDefPtr *monConfig,
                      bool *monJSON)
 {
-    virDomainDefPtr def;
+    virDomainDefPtr def = NULL;
     size_t i;
     bool nographics = false;
     bool fullscreen = false;
@@ -1852,7 +1852,7 @@ qemuParseCommandLine(virFileCachePtr capsCache,
     virDomainDiskDefPtr disk = NULL;
     const char *ceph_args = qemuFindEnv(progenv, "CEPH_ARGS");
     bool have_sdl = false;
-    virQEMUCapsPtr qemuCaps;
+    virQEMUCapsPtr qemuCaps = NULL;
 
     if (pidfile)
         *pidfile = NULL;