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

Timestamp:

May 25, 2019 8:51:40 PM (6 years ago)

Author:

vboxsync

Message:

Console::powerUp: Another delete NULL on the unlikely chance of catching a bad_alloc.

File:

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

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

@@ -2224 +2224 @@
             if (!pTask->isOk())
             {
-                hrc = setError(FAILED(hrc) ? hrc : E_FAIL, "Could not create VMPowerDownTask object\n");
+                hrc = setError(FAILED(pTask->rc()) ? pTask->rc() : E_FAIL, "Could not create VMPowerDownTask object\n");
                 delete(pTask);
                 pTask = NULL;
@@ -7621 +7621 @@
     LONG cOperations = 1;
     LONG ulTotalOperationsWeight = 1;
-    VMPowerUpTask* task = NULL;
+    VMPowerUpTask *task = NULL;
 
     try
@@ -7740 +7740 @@
         /* Setup task object and thread to carry out the operation
          * asynchronously */
-        try
-        {
-            task = new VMPowerUpTask(this, pPowerupProgress);
-            if (!task->isOk())
-            {
-                throw E_FAIL;
-            }
-        }
-        catch(...)
-        {
-            delete task;
-            rc = setError(E_FAIL, "Could not create VMPowerUpTask object \n");
-            throw rc;
-        }
+        try { task = new VMPowerUpTask(this, pPowerupProgress); }
+        catch (std::bad_alloc &) { throw rc = E_OUTOFMEMORY; }
+        if (!task->isOk())
+            throw task->rc();
 
         task->mConfigConstructor = i_configConstructor;
@@ -7759 +7749 @@
         task->mStartPaused = aPaused;
         if (mMachineState == MachineState_Saved)
-            task->mSavedStateFile = savedStateFile;
+            try { task->mSavedStateFile = savedStateFile; }
+            catch (std::bad_alloc &) { throw rc = E_OUTOFMEMORY; }
         task->mTeleporterEnabled = fTeleporterEnabled;
         task->mEnmFaultToleranceState = enmFaultToleranceState;
@@ -7901 +7892 @@
             AssertComRCReturnRC(rc);
         }
-        else if (    mMachineState == MachineState_Saved
-            ||  (!fTeleporterEnabled && !fFaultToleranceSyncEnabled))
+        else if (   mMachineState == MachineState_Saved
+                 || (!fTeleporterEnabled && !fFaultToleranceSyncEnabled))
         {
             rc = pPowerupProgress->init(static_cast<IConsole *>(this),
@@ -8012 +8003 @@
         /* setup task object and thread to carry out the operation
          * asynchronously */
-        if (aProgress){
-                rc = pPowerupProgress.queryInterfaceTo(aProgress);
-                AssertComRCReturnRC(rc);
+        if (aProgress)
+        {
+            rc = pPowerupProgress.queryInterfaceTo(aProgress);
+            AssertComRCReturnRC(rc);
         }
 
         rc = task->createThread();
-
+        task = NULL;
         if (FAILED(rc))
             throw rc;
@@ -8034 +8026 @@
             i_setMachineState(MachineState_Starting);
     }
-    catch (HRESULT aRC) { rc = aRC; }
+    catch (HRESULT aRC)
+    {
+        rc = aRC;
+    }
 
     if (FAILED(rc) && fBeganPoweringUp)
@@ -8051 +8046 @@
         /* signal end of operation */
         mControl->EndPowerUp(rc);
+    }
+
+    if (task)
+    {
+        ErrorInfoKeeper eik;
+        delete task;
     }
 
@@ -8848 +8849 @@
                  * asynchronously (if we call powerDown() right here but there
                  * is one or more mpUVM callers (added with addVMCaller()) we'll
-                 * deadlock).
-                 */
-                VMPowerDownTask* task = NULL;
+                 * deadlock). */
+                VMPowerDownTask *task = NULL;
                 try
                 {