Changeset 55940 in vbox

Timestamp:

May 19, 2015 6:59:30 PM (9 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: make sure we don't crash when there's no VM process (and thus no console) for the named machine with controlvm.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -110 +110 @@
         /* ... and session machine */
         CHECK_ERROR_BREAK(a->session, COMGETTER(Machine)(sessionMachine.asOutParam()));
+
+        if (!console)
+        {
+            errorArgument("Machine '%s' is not currently running", a->argv[0]);
+            return 1;
+        }
 
         /* which command? */
@@ -1395 +1401 @@
         }
 #ifdef VBOX_WITH_VPX
-        /* 
-         * Note: Commands starting with "vcp" are the deprecated versions and are 
-         *       kept to ensure backwards compatibility. 
+        /*
+         * Note: Commands starting with "vcp" are the deprecated versions and are
+         *       kept to ensure backwards compatibility.
          */
         else if (   !strcmp(a->argv[1], "videocap")
@@ -1564 +1570 @@
                 rc = E_FAIL;
                 break;
-            }   
+            }
 
             uint32_t uVal;
@@ -1584 +1590 @@
                 rc = E_FAIL;
                 break;
-            } 
+            }
 
             uint32_t uVal;
@@ -1604 +1610 @@
                 rc = E_FAIL;
                 break;
-            }   
+            }
 
             uint32_t uVal;
@@ -1624 +1630 @@
                 rc = E_FAIL;
                 break;
-            }   
+            }
 
             CHECK_ERROR_BREAK(sessionMachine, COMSETTER(VideoCaptureOptions)(Bstr(a->argv[3]).raw()));