From 44699b3283e9769ec81be35056f1b9e2aa9a9912 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Tue, 3 May 2011 10:41:57 -0600
Subject: [PATCH] virsh: avoid null pointer dereference

Clang detected that vol-download will call unlink(NULL) if there
is a parse error during option parsing.  Also, mingw doesn't like
unlinking an open file.

* tools/virsh.c (cmdVolDownload): Only unlink file if created.
---
 tools/virsh.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/virsh.c b/tools/virsh.c
index 3d4ed2ffe6..5d8b025017 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -7259,10 +7259,10 @@ cmdVolDownload (vshControl *ctl, const vshCmd *cmd)
     virStreamPtr st = NULL;
     const char *name = NULL;
     unsigned long long offset = 0, length = 0;
-    bool created = true;
+    bool created = false;
 
     if (!vshConnectionUsability(ctl, ctl->conn))
-        goto cleanup;
+        return false;
 
     if (vshCommandOptULongLong(cmd, "offset", &offset) < 0) {
         vshError(ctl, _("Unable to parse integer"));
@@ -7283,12 +7283,13 @@ cmdVolDownload (vshControl *ctl, const vshCmd *cmd)
     }
 
     if ((fd = open(file, O_WRONLY|O_CREAT|O_EXCL, 0666)) < 0) {
-        created = false;
         if (errno != EEXIST ||
             (fd = open(file, O_WRONLY|O_TRUNC, 0666)) < 0) {
             vshError(ctl, _("cannot create %s"), file);
             goto cleanup;
         }
+    } else {
+        created = true;
     }
 
     st = virStreamNew(ctl->conn, 0);
@@ -7316,13 +7317,13 @@ cmdVolDownload (vshControl *ctl, const vshCmd *cmd)
     ret = true;
 
 cleanup:
+    VIR_FORCE_CLOSE(fd);
     if (ret == false && created)
         unlink(file);
     if (vol)
         virStorageVolFree(vol);
     if (st)
         virStreamFree(st);
-    VIR_FORCE_CLOSE(fd);
     return ret;
 }
 
-- 
GitLab