Changeset 56603 in vbox

Timestamp:

Jun 23, 2015 2:44:40 PM (10 years ago)

Author:

vboxsync

Message:

xpcom: don't crash during JavaXPCOMInstance::~JavaXPCOMInstance()

File:

• trunk/src/libs/xpcom18a4/java/src/nsJavaXPCOMBindingUtils.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/java/src/nsJavaXPCOMBindingUtils.cpp

@@ -788 +788 @@
 
 #ifdef VBOX
+# if 0
   nsCOMPtr<nsIEventQueue> eq = do_GetMainThreadQueue();
   rv = NS_ProxyRelease(eq.get(), mInstance);
   rv |= NS_ProxyRelease(eq.get(), mIInfo);
+# else
+  // The above code crashes in nsTraceRefcntImpl::LogAddCOMPtr() (@bugref 7620)
+  NS_RELEASE(mInstance);
+  NS_RELEASE(mIInfo);
+  rv = NS_OK;
+# endif
 #else
   // Need to release these objects on the main thread.