From: Eric Blake <eblake@redhat.com>
Date: Fri, 30 Nov 2012 21:48:24 +0000 (-0700)
Subject: virsh: don't crash if shutdown --mode not provided
X-Git-Tag: v1.0.1-rc1~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72437526946febbe87aab585879db859946c00e9;p=thirdparty%2Flibvirt.git

virsh: don't crash if shutdown --mode not provided

virStringSplit requires a non-NULL input, but commit cef78ed forgot
to follow the rule.

* tools/virsh-domain.c (cmdReboot, cmdShutdown): Avoid NULL deref.
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 9f1a3d46f1..f12777c649 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -4036,20 +4036,20 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd)
     const char *mode = NULL;
     int flags = 0;
     int rv;
-    char **modes, **tmp;
+    char **modes = NULL, **tmp;
 
     if (vshCommandOptString(cmd, "mode", &mode) < 0) {
         vshError(ctl, "%s", _("Invalid type"));
         return false;
     }
 
-    if (!(modes = virStringSplit(mode, ",", 0))) {
+    if (mode && !(modes = virStringSplit(mode, ",", 0))) {
         vshError(ctl, "%s", _("Cannot parse mode string"));
         return false;
     }
 
     tmp = modes;
-    while (*tmp) {
+    while (tmp && *tmp) {
         mode = *tmp;
         if (STREQ(mode, "acpi")) {
             flags |= VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN;
@@ -4112,20 +4112,20 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd)
     const char *name;
     const char *mode = NULL;
     int flags = 0;
-    char **modes, **tmp;
+    char **modes = NULL, **tmp;
 
     if (vshCommandOptString(cmd, "mode", &mode) < 0) {
         vshError(ctl, "%s", _("Invalid type"));
         return false;
     }
 
-    if (!(modes = virStringSplit(mode, ",", 0))) {
+    if (mode && !(modes = virStringSplit(mode, ",", 0))) {
         vshError(ctl, "%s", _("Cannot parse mode string"));
         return false;
     }
 
     tmp = modes;
-    while (*tmp) {
+    while (tmp && *tmp) {
         mode = *tmp;
         if (STREQ(mode, "acpi")) {
             flags |= VIR_DOMAIN_REBOOT_ACPI_POWER_BTN;