Changeset 47800 in vbox for trunk/src

Timestamp:

Aug 16, 2013 11:15:56 AM (11 years ago)

Author:

vboxsync

Message:

Main/glue: fix error checking so that a missing components subdirectory (or one in an unexpected place) does not cause crashes due to NULL object reference use

Location:

trunk/src/VBox/Main/glue

Files:

• NativeEventQueue.cpp (modified) (1 diff)
• initterm.cpp (modified) (3 diffs)

trunk/src/VBox/Main/glue/NativeEventQueue.cpp

@@ -224 +224 @@
         nsCOMPtr<nsIEventQueue> q;
         nsresult rv = NS_GetMainEventQ(getter_AddRefs(q));
-        Assert(NS_SUCCEEDED(rv));
+        AssertComRCReturnRC(rv);
         Assert(q == sMainQueue->mEventQ);
 

trunk/src/VBox/Main/glue/initterm.cpp

@@ -495 +495 @@
 
         /* clean up before the new try */
-        rc = NS_ShutdownXPCOM(nsnull);
+        HRESULT rc2 = NS_ShutdownXPCOM(nsnull);
+        if (SUCCEEDED(rc))
+            rc = rc2;
 
         if (i == 0)
@@ -505 +507 @@
 
 #endif /* !defined (VBOX_WITH_XPCOM) */
+
+    AssertComRCReturnRC(rc);
 
     // for both COM and XPCOM, we only get here if this is the main thread;
@@ -510 +514 @@
     Assert(RTThreadIsMain(RTThreadSelf()));
     util::InitAutoLockSystem();
-
-    AssertComRC(rc);
 
     /*