Changeset 42867 in vbox for trunk

Timestamp:

Aug 17, 2012 2:06:26 PM (12 years ago)

Author:

vboxsync

Message:

GuestImpl: Check for bad_alloc (DnD), cleaning up guest sessions.

File:

• trunk/src/VBox/Main/src-client/GuestImpl.cpp (modified) (2 diffs)

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

@@ -104 +104 @@
     AssertMsgRC(vrc, ("Failed to create guest statistics update timer(%Rra)\n", vrc));
 
+    try
+    {
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    m_pGuestDnD = new GuestDnD(this);
+        m_pGuestDnD = new GuestDnD(this);
+        AssertPtr(m_pGuestDnD);
 #endif
+    }
+    catch(std::bad_alloc &)
+    {
+        return E_OUTOFMEMORY;
+    }
 
     return S_OK;
@@ -130 +138 @@
     mMagic     = 0;
 
+#ifdef VBOX_WITH_GUEST_CONTROL
+    GuestSessions::iterator itSessions = mData.mGuestSessions.begin();
+    while (itSessions != mData.mGuestSessions.end())
+    {
+        if (!itSessions->second.isNull())
+            itSessions->second->uninit();
+        itSessions++;
+    }
+    mData.mGuestSessions.clear();
+#endif
+
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    delete m_pGuestDnD;
-    m_pGuestDnD = NULL;
+    if (m_pGuestDnD)
+    {
+        delete m_pGuestDnD;
+        m_pGuestDnD = NULL;
+    }
 #endif