Changeset 39411 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 24, 2011 4:48:52 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75032

Message:

Main/ConsoleImpl: don't crash if Console::drvStatus_MediumEjected is called even if there is no medium to eject

File:

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

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

@@ -9589 +9589 @@
         if (!pMediumAtt.isNull())
         {
-            IMedium *pMedium;
+            IMedium *pMedium = NULL;
             HRESULT rc = pMediumAtt->COMGETTER(Medium)(&pMedium);
             AssertComRC(rc);
-            BOOL fHostDrive = FALSE;
-            rc = pMedium->COMGETTER(HostDrive)(&fHostDrive);
-            AssertComRC(rc);
-            if (!fHostDrive)
+            if (SUCCEEDED(rc) && pMedium)
             {
-                alock.release();
-
-                ComPtr<IMediumAttachment> pNewMediumAtt;
-                rc = pData->pConsole->mControl->EjectMedium(pMediumAtt, pNewMediumAtt.asOutParam());
-                if (SUCCEEDED(rc))
-                    fireMediumChangedEvent(pData->pConsole->mEventSource, pNewMediumAtt);
-
-                alock.acquire();
-                if (pNewMediumAtt != pMediumAtt)
+                BOOL fHostDrive = FALSE;
+                rc = pMedium->COMGETTER(HostDrive)(&fHostDrive);
+                AssertComRC(rc);
+                if (!fHostDrive)
                 {
-                    pData->pmapMediumAttachments->erase(devicePath);
-                    pData->pmapMediumAttachments->insert(std::make_pair(devicePath, pNewMediumAtt));
+                    alock.release();
+
+                    ComPtr<IMediumAttachment> pNewMediumAtt;
+                    rc = pData->pConsole->mControl->EjectMedium(pMediumAtt, pNewMediumAtt.asOutParam());
+                    if (SUCCEEDED(rc))
+                        fireMediumChangedEvent(pData->pConsole->mEventSource, pNewMediumAtt);
+
+                    alock.acquire();
+                    if (pNewMediumAtt != pMediumAtt)
+                    {
+                        pData->pmapMediumAttachments->erase(devicePath);
+                        pData->pmapMediumAttachments->insert(std::make_pair(devicePath, pNewMediumAtt));
+                    }
                 }
             }