Changeset 7153 in vbox

Timestamp:

Feb 26, 2008 5:19:39 PM (17 years ago)

Author:

vboxsync

Message:

XPCOM/IPC/DConnect: Check for client ID when checking instance wrapper validity (to properly ignore requests from disconnected clients to release/invoke methods on wrappers whose addresses have been reused by newer clients).

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (7 diffs)

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

@@ -1613 +1613 @@
     DConnectInstance *wrapper = (DConnectInstance *) bits;
     // make sure we've been sent a valid wrapper
-    if (!CheckInstanceAndAddRef(wrapper))
+    if (!CheckInstanceAndAddRef(wrapper, peer))
     {
       NS_NOTREACHED("instance wrapper not found");
@@ -2059 +2059 @@
     // the real instance.
     DConnectInstance *wrapper = (DConnectInstance *) bits;
-    if (CheckInstanceAndAddRef(wrapper))
+    if (CheckInstanceAndAddRef(wrapper, peer))
     {
       *xcpt = (nsIException *) wrapper->RealInstance();
@@ -3069 +3069 @@
 
 PRBool
-ipcDConnectService::CheckInstanceAndAddRef(DConnectInstance *wrapper)
+ipcDConnectService::CheckInstanceAndAddRef(DConnectInstance *wrapper, PRUint32 peer)
 {
   nsAutoLock lock (mLock);
 
-  PRBool result = mInstanceSet.Contains(wrapper);
-  if (result)
+  if (mInstanceSet.Contains(wrapper) && wrapper->Peer() == peer)
+  {
     wrapper->AddRef();
-  return result;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
 }
 
@@ -3440 +3442 @@
 
       // make sure we've been sent a valid wrapper
-      if (!CheckInstanceAndAddRef(setupQI->instance))
+      if (!CheckInstanceAndAddRef(setupQI->instance, peer))
       {
         NS_NOTREACHED("instance wrapper not found");
@@ -3593 +3595 @@
   nsAutoLock lock (mLock);
 
-  // make sure we've been sent a valid wrapper
-  if (mInstanceSet.Contains(wrapper))
+  // make sure we've been sent a valid wrapper from the same peer we created
+  // this wrapper for
+  if (mInstanceSet.Contains(wrapper) && wrapper->Peer() == peer)
   {
     // release the IPC reference from under the lock to ensure atomicity of
@@ -3613 +3616 @@
     // a debug warning
     LOG(("ipcDConnectService::OnRelease: WARNING: "
-         "instance wrapper %p not found", wrapper));
+         "instance wrapper %p for peer %d not found", wrapper, peer));
   }
 }
@@ -3637 +3640 @@
 
   // make sure we've been sent a valid wrapper
-  if (!CheckInstanceAndAddRef(wrapper))
+  if (!CheckInstanceAndAddRef(wrapper, peer))
   {
     NS_NOTREACHED("instance wrapper not found");