Changeset 78752 in vbox for trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

Timestamp:

May 25, 2019 8:59:23 PM (6 years ago)

Author:

vboxsync

Message:

Console::i_vmstateChangeCallback/VMSTATE_OFF: Same delete NULL scenario as previously, but now with uncaught HRESULT throws on EMT thrown, as it were, into the mix. We should really forbid throwing stuff in Main, it is _clearly_ too difficult to get simple things like this half right.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -8846 +8846 @@
                 that->i_setMachineStateLocally(MachineState_Stopping);
 
-                /* Setup task object and thread to carry out the operation
+                /*
+                 * Setup task object and thread to carry out the operation
                  * asynchronously (if we call powerDown() right here but there
                  * is one or more mpUVM callers (added with addVMCaller()) we'll
-                 * deadlock). */
+                 * deadlock).
+                 */
                 VMPowerDownTask *task = NULL;
                 try
                 {
                     task = new VMPowerDownTask(that, pProgress);
-                     /* If creating a task failed, this can currently mean one of
-                      * two: either Console::uninit() has been called just a ms
-                      * before (so a powerDown() call is already on the way), or
-                      * powerDown() itself is being already executed. Just do
-                      * nothing.
-                      */
-                    if (!task->isOk())
-                    {
-                        LogFlowFunc(("Console is already being uninitialized. \n"));
-                        throw E_FAIL;
-                    }
                 }
-                catch(...)
+                catch (std::bad_alloc &)
                 {
+                    LogRelFunc(("E_OUTOFMEMORY creating VMPowerDownTask"));
+                    rc = E_OUTOFMEMORY;
+                    break;
+                }
+
+                /*
+                 * If creating a task failed, this can currently mean one of
+                 * two: either Console::uninit() has been called just a ms
+                 * before (so a powerDown() call is already on the way), or
+                 * powerDown() itself is being already executed. Just do
+                 * nothing.
+                 */
+                if (!task->isOk())
+                {
+                    rc = task->createThread();
+                    task = NULL;
+                    if (FAILED(rc))
+                        LogRelFunc(("Problem with creating thread for VMPowerDownTask.\n"));
+                }
+                else
+                {
+                    LogFlowFunc(("Console is already being uninitialized. (%Rhrc)\n", task->rc()));
                     delete task;
-                    LogFlowFunc(("Problem with creating VMPowerDownTask object. \n"));
+                    rc = E_FAIL;
                 }
-
-                rc = task->createThread();
-
-                if (FAILED(rc))
-                {
-                    LogFlowFunc(("Problem with creating thread for VMPowerDownTask. \n"));
-                }
-
             }
             break;