Changeset 79053 in vbox

Timestamp:

Jun 8, 2019 11:19:19 PM (6 years ago)

Author:

vboxsync

Message:

Main/GuestImpl.cpp: Must always catch bad_alloc when on an EMT (Guest::i_facilityUpdate).

File:

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

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

@@ -1019 +1019 @@
 
         ComObjPtr<AdditionsFacility> ptrFac;
-        ptrFac.createObject();
-        AssertReturn(!ptrFac.isNull(), false);
-
-        HRESULT hrc = ptrFac->init(this, (AdditionsFacilityType_T)a_enmFacility, (AdditionsFacilityStatus_T)a_enmStatus,
-                                   a_fFlags, a_pTimeSpecTS);
+        HRESULT hrc = ptrFac.createObject();
         AssertComRCReturn(hrc, false);
-        mData.mFacilityMap.insert(std::make_pair((AdditionsFacilityType_T)a_enmFacility, ptrFac));
-        fChanged = true;
+        Assert(ptrFac);
+
+        hrc = ptrFac->init(this, (AdditionsFacilityType_T)a_enmFacility, (AdditionsFacilityStatus_T)a_enmStatus,
+                           a_fFlags, a_pTimeSpecTS);
+        AssertComRCReturn(hrc, false);
+        try
+        {
+            mData.mFacilityMap.insert(std::make_pair((AdditionsFacilityType_T)a_enmFacility, ptrFac));
+            fChanged = true;
+        }
+        catch (std::bad_alloc &)
+        {
+            fChanged = false;
+        }
     }
     return fChanged;