Changeset 78759 in vbox for trunk/include/VBox

Timestamp:

May 26, 2019 3:13:07 AM (6 years ago)

Author:

vboxsync

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

130846

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. [build fix]

File:

• trunk/include/VBox/com/ptr.h (modified) (3 diffs)

trunk/include/VBox/com/ptr.h

@@ -514 +514 @@
 #else /* VBOX_WITH_XPCOM */
         ATL::CComObject<T> *obj;
+# ifndef RT_EXCEPTIONS_ENABLED
+        obj = new ATL::CComObject<T>();
+# else
         try
         {
@@ -522 +525 @@
             obj = NULL;
         }
+# endif
         if (obj)
         {
+# ifndef RT_EXCEPTIONS_ENABLED
             try
             {
@@ -530 +535 @@
             catch (std::bad_alloc &)
             {
+                hrc = E_OUTOFMEMORY;
+            }
+# else
+            hrc = obj->FinalConstruct();
+# endif
+            if (FAILED(hrc))
+            {
                 delete obj;
                 obj = NULL;
-                hrc = E_OUTOFMEMORY;
             }
         }