From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 9 Sep 2014 15:13:29 +0000 (+0200)
Subject: virsh: domain: Clean up handling of "dom" in "save" command
X-Git-Tag: CVE-2014-3633~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e22c5c57eebf200d04b0207c48edfdf74edabd7f;p=thirdparty%2Flibvirt.git

virsh: domain: Clean up handling of "dom" in "save" command
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 70960b410b..86deae66a3 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -3887,7 +3887,8 @@ doSave(void *opaque)
  out:
     pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL);
  out_sig:
-    if (dom) virDomainFree(dom);
+    if (dom)
+        virDomainFree(dom);
     VIR_FREE(xml);
     ignore_value(safewrite(data->writefd, &ret, sizeof(ret)));
 }
@@ -4051,8 +4052,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd)
         vshPrint(ctl, _("\nDomain %s saved to %s\n"), name, to);
 
  cleanup:
-    if (dom)
-        virDomainFree(dom);
+    virDomainFree(dom);
     return ret;
 }