Changeset 39341 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd

Timestamp:

Nov 16, 2011 8:10:04 PM (13 years ago)

Author:

vboxsync

Message:

XPCOM: fix for race in cleaning up wrappers

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src

Files:

• ipcDConnectService.cpp (modified) (7 diffs)
• ipcDConnectService.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -300 +300 @@
 
 void
-ipcDConnectService::ReleaseWrappers(nsVoidArray &wrappers)
-{
+ipcDConnectService::ReleaseWrappers(nsVoidArray &wrappers, PRUint32 peer)
+{
+  nsAutoLock lock (mLock);
+
   for (PRInt32 i=0; i<wrappers.Count(); ++i)
   {
-    ((DConnectInstance *) wrappers[i])->ReleaseIPC();
-    ((DConnectInstance *) wrappers[i])->Release();
+    DConnectInstance *wrapper = (DConnectInstance *)wrappers[i];
+    if (mInstanceSet.Contains(wrapper) && wrapper->Peer() == peer)
+    {
+      ((DConnectInstance *) wrappers[i])->ReleaseIPC();
+      ((DConnectInstance *) wrappers[i])->Release();
+    }
   }
 }
@@ -2571 +2577 @@
   {
     // INVOKE message wasn't sent; clean up wrappers
-    dConnect->ReleaseWrappers(wrappers);
+    dConnect->ReleaseWrappers(wrappers, mPeerID);
     return rv;
   }
@@ -2591 +2597 @@
       {
         // INVOKE message wasn't sent; clean up wrappers
-        dConnect->ReleaseWrappers(wrappers);
+        dConnect->ReleaseWrappers(wrappers, mPeerID);
         return rv;
       }
@@ -2608 +2614 @@
   {
     // INVOKE message wasn't delivered; clean up wrappers
-    dConnect->ReleaseWrappers(wrappers);
+    dConnect->ReleaseWrappers(wrappers, mPeerID);
     return rv;
   }
@@ -2629 +2635 @@
     {
       // INVOKE message wasn't received; clean up wrappers
-      dConnect->ReleaseWrappers(wrappers);
+      dConnect->ReleaseWrappers(wrappers, mPeerID);
       return rv;
     }
@@ -3761 +3767 @@
   {
     LOG(("unable to send SETUP_REPLY: rv=%x\n", rv));
-    ReleaseWrappers(wrappers);
+    ReleaseWrappers(wrappers, peer);
   }
 }
@@ -4042 +4048 @@
   {
     LOG(("unable to send INVOKE_REPLY: rv=%x\n", rv));
-    ReleaseWrappers(wrappers);
+    ReleaseWrappers(wrappers, peer);
   }
 

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.h

@@ -235 +235 @@
                                             PRUint32 peer, nsIException **xcpt);
 
-  NS_HIDDEN_(void)     ReleaseWrappers(nsVoidArray &wrappers);
+  NS_HIDDEN_(void)     ReleaseWrappers(nsVoidArray &wrappers,  PRUint32 peer);
 
   NS_HIDDEN_(nsresult) CreateStub(const nsID &, PRUint32, DConAddr, DConnectStub **);