Changeset 78756 in vbox for trunk/include/VBox

Timestamp:

May 26, 2019 2:59:24 AM (6 years ago)

Author:

vboxsync

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

130843

Message:

VBox/com/ptr.h,VBox/com/microatl.h: Catch all bad_alloc exceptions in createObject and CreateInstance and turn them into E_OUTOFMEMORY return codes. This greatly simplifies exception analysis in code using these two methods.

Location:

trunk/include/VBox/com

Files:

• microatl.h (modified) (1 diff)
• ptr.h (modified) (1 diff)

trunk/include/VBox/com/microatl.h

@@ -1050 +1050 @@
 
         HRESULT hrc = E_OUTOFMEMORY;
-        CComObject<Base> *p = new(std::nothrow) CComObject<Base>();
+        CComObject<Base> *p = NULL;
+        try
+        {
+            p = new CComObject<Base>();
+        }
+        catch (std::bad_alloc &)
+        {
+            p = NULL;
+        }
         if (p)
         {
             p->InternalFinalConstructAddRef();
-            hrc = p->_AtlInitialConstruct();
-            if (SUCCEEDED(hrc))
-                hrc = p->FinalConstruct();
+            try
+            {
+                hrc = p->_AtlInitialConstruct();
+                if (SUCCEEDED(hrc))
+                    hrc = p->FinalConstruct();
+            }
+            catch (std::bad_alloc &)
+            {
+                hrc = E_OUTOFMEMORY;
+            }
             p->InternalFinalConstructRelease();
             if (FAILED(hrc))

trunk/include/VBox/com/ptr.h

@@ -469 +469 @@
      *  object doesn't increase the lock count of the server module, as it
      *  does otherwise.
+     *
+     *  @note In order to make it easier to use, this method does _not_ throw
+     *        bad_alloc, but instead returns E_OUTOFMEMORY.
      */
     HRESULT createObject()
     {
-        HRESULT rc;
+        HRESULT hrc;
 #ifndef VBOX_WITH_XPCOM
 # ifdef VBOX_COM_OUTOFPROC_MODULE
-        ATL::CComObjectNoLock<T> *obj = new ATL::CComObjectNoLock<T>();
+        ATL::CComObjectNoLock<T> *obj = NULL;
+        try
+        {
+            obj = new ATL::CComObjectNoLock<T>();
+        }
+        catch (std::bad_alloc &)
+        {
+            obj = NULL;
+        }
         if (obj)
         {
             obj->InternalFinalConstructAddRef();
-            rc = obj->FinalConstruct();
+            try
+            {
+                hrc = obj->FinalConstruct();
+            }
+            catch (std::bad_alloc &)
+            {
+                hrc = E_OUTOFMEMORY;
+            }
             obj->InternalFinalConstructRelease();
+            if (FAILED(hrc))
+            {
+                delete obj;
+                obj = NULL;
+            }
         }
         else
-            rc = E_OUTOFMEMORY;
+            hrc = E_OUTOFMEMORY;
 # else
         ATL::CComObject<T> *obj = NULL;
-        rc = ATL::CComObject<T>::CreateInstance(&obj);
+        hrc = ATL::CComObject<T>::CreateInstance(&obj);
 # endif
 #else /* VBOX_WITH_XPCOM */
-        ATL::CComObject<T> *obj = new ATL::CComObject<T>();
+        ATL::CComObject<T> *obj;
+        try
+        {
+            obj = new ATL::CComObject<T>();
+        }
+        catch (std::bad_alloc &)
+        {
+            obj = NULL;
+        }
         if (obj)
-            rc = obj->FinalConstruct();
+        {
+            try
+            {
+                hrc = obj->FinalConstruct();
+            }
+            catch (std::bad_alloc &)
+            {
+                delete obj;
+                obj = NULL;
+                hrc = E_OUTOFMEMORY;
+            }
+        }
         else
-            rc = E_OUTOFMEMORY;
+            hrc = E_OUTOFMEMORY;
 #endif /* VBOX_WITH_XPCOM */
         *this = obj;
-        return rc;
+        return hrc;
     }
 };