Changeset 47778 in vbox for trunk/src/libs/xpcom18a4/xpcom/components

Timestamp:

Aug 15, 2013 5:51:36 PM (11 years ago)

Author:

vboxsync

Message:

libs/xpcom: suppress a normally not working attempt to initialize XPCOM. We don't rely on magic initialization, and it's actually not safe as this initialization attempt would lead to a limited depth recursion to find out the component search directory which isn't correct

File:

• trunk/src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp

@@ -2376 +2376 @@
     mon.Enter();
 
-#ifdef XPCOM_CHECK_PENDING_CIDS 
+#ifdef XPCOM_CHECK_PENDING_CIDS
     if (entry)
         RemovePendingCID(entry->mCid);
@@ -3723 +3723 @@
     if (nsComponentManagerImpl::gComponentManager == nsnull)
     {
+#ifdef VBOX
+        // While XPCOM might need initialization, we're not in a position
+        // to pass the right values to this call. This is actually triggered
+        // on object destruction, so there is no point in re-initializing,
+        // and actually the attempt would lead to nested calls to
+        // xptiInterfaceInfoManager::BuildFileSearchPath, which it detects
+        // as unsafe in debug builds. Just fail, no real problem.
+#ifdef DEBUG
+        printf("NS_GetServiceManager: no current instance, suppressed XPCOM initialization!\n");
+#endif
+        rv = NS_ERROR_SERVICE_NOT_AVAILABLE;
+#else /* !VBOX */
         // XPCOM needs initialization.
         rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
+#endif /* !VBOX */
     }