[libvirt] [PATCH v2] virsh-volume: Add missing check when calling virStreamNew

Hongwei Bi hwbi2008 at gmail.com
Sun Sep 29 09:24:11 UTC 2013


Check return value of virStreamNew when called by
cmdVolUpload and cmdVolDownload.


---
 tools/virsh-volume.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index 7dab532..0a66a6c 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -665,7 +665,11 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd)
         goto cleanup;
     }
 
-    st = virStreamNew(ctl->conn, 0);
+    if (!(st = virStreamNew(ctl->conn, 0))) {
+        vshError(ctl, _("cannot create a new stream"));
+        goto cleanup;
+    }
+
     if (virStorageVolUpload(vol, st, offset, length, 0) < 0) {
         vshError(ctl, _("cannot upload to volume %s"), name);
         goto cleanup;
@@ -775,7 +779,11 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd)
         created = true;
     }
 
-    st = virStreamNew(ctl->conn, 0);
+    if (!(st = virStreamNew(ctl->conn, 0))) {
+        vshError(ctl, _("cannot create a new stream"));
+        goto cleanup;
+    }
+
     if (virStorageVolDownload(vol, st, offset, length, 0) < 0) {
         vshError(ctl, _("cannot download from volume %s"), name);
         goto cleanup;
-- 
1.7.1




More information about the libvir-list mailing list