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

Timestamp:

May 26, 2019 9:13:12 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. [fix]

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (3 diffs)

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

@@ -8852 +8852 @@
                  * deadlock).
                  */
-                VMPowerDownTask *task = NULL;
+                VMPowerDownTask *pTask = NULL;
                 try
                 {
-                    task = new VMPowerDownTask(that, pProgress);
+                    pTask = new VMPowerDownTask(that, pProgress);
                 }
                 catch (std::bad_alloc &)
@@ -8871 +8871 @@
                  * nothing.
                  */
-                if (!task->isOk())
+                if (pTask->isOk())
                 {
-                    rc = task->createThread();
-                    task = NULL;
+                    rc = pTask->createThread();
+                    pTask = NULL;
                     if (FAILED(rc))
                         LogRelFunc(("Problem with creating thread for VMPowerDownTask.\n"));
@@ -8880 +8880 @@
                 else
                 {
-                    LogFlowFunc(("Console is already being uninitialized. (%Rhrc)\n", task->rc()));
-                    delete task;
+                    LogFlowFunc(("Console is already being uninitialized. (%Rhrc)\n", pTask->rc()));
+                    delete pTask;
+                    pTask = NULL;
                     rc = E_FAIL;
                 }