virsh: Back out if the argument for vol-create-as is malformed

(cherry picked from commit ee58b581c4b275f06904253285b7ad562dc09745)

Conflicts:

	tools/virsh.c

diff --git a/tools/virsh.c b/tools/virsh.c
index 61d530762e84a4635863bf0262d684c07dbb7f63..31d784cecea80ce914271702f47cbd9b7d45678b 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -11121,18 +11121,24 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd)
 
     if (vshCommandOptString(cmd, "capacity", &capacityStr) <= 0)
         goto cleanup;
-    if (vshVolSize(capacityStr, &capacity) < 0)
+
+    if (vshVolSize(capacityStr, &capacity) < 0) {
         vshError(ctl, _("Malformed size %s"), capacityStr);
+        goto cleanup;
+    }
 
-    if ((vshCommandOptString(cmd, "allocation", &allocationStr) > 0) &&
-        (vshVolSize(allocationStr, &allocation) < 0))
+    if (vshCommandOptString(cmd, "allocation", &allocationStr) > 0 &&
+        vshVolSize(allocationStr, &allocation) < 0) {
         vshError(ctl, _("Malformed size %s"), allocationStr);
+        goto cleanup;
+    }
 
     if (vshCommandOptString(cmd, "format", &format) < 0 ||
         vshCommandOptString(cmd, "backing-vol", &snapshotStrVol) < 0 ||
         vshCommandOptString(cmd, "backing-vol-format",
                             &snapshotStrFormat) < 0) {
         vshError(ctl, "%s", _("missing argument"));
+        goto cleanup;
     }