From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 9 Oct 2013 16:05:13 +0000 (+0200)
Subject: qemu: refactor qemuCompressProgramAvailable()
X-Git-Tag: CVE-2013-4401~115
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a863b8901012fc8e87fc4cdce4a0305830ecbb7a;p=thirdparty%2Flibvirt.git

qemu: refactor qemuCompressProgramAvailable()
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b9f340cc6d..cfdbb9a17b 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3138,18 +3138,18 @@ cleanup:
 }
 
 /* Returns true if a compression program is available in PATH */
-static bool qemuCompressProgramAvailable(virQEMUSaveFormat compress)
+static bool
+qemuCompressProgramAvailable(virQEMUSaveFormat compress)
 {
-    const char *prog;
-    char *c;
+    char *path;
 
     if (compress == QEMU_SAVE_FORMAT_RAW)
         return true;
-    prog = qemuSaveCompressionTypeToString(compress);
-    c = virFindFileInPath(prog);
-    if (!c)
+
+    if (!(path = virFindFileInPath(qemuSaveCompressionTypeToString(compress))))
         return false;
-    VIR_FREE(c);
+
+    VIR_FREE(path);
     return true;
 }