Changeset 17381 in vbox for trunk

Timestamp:

Mar 5, 2009 10:11:15 AM (16 years ago)

Author:

vboxsync

Message:

XPCOM/IPC/DConnect: Return NS_ERROR_INVALID_POINTER instead of crash if a NULL pointer is passed as an input nsID parameter through an IPC method call.

File:

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

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

@@ -344 +344 @@
 
     case nsXPTType::T_IID:
-      writer.PutBytes(v.val.p, sizeof(nsID));
+      {
+        if (v.val.p)
+          writer.PutBytes(v.val.p, sizeof(nsID));
+        else
+          return NS_ERROR_INVALID_POINTER;
+      }
       break;
 
@@ -2408 +2413 @@
 
       if (NS_FAILED(rv))
-        return rv;
+        break;
     }
     else if ((paramInfo.IsOut() || paramInfo.IsRetval()) && !aParams[i].val.p)
     {
       // report error early if NULL pointer is passed as an output parameter
-      return NS_ERROR_NULL_POINTER;
-    }
+      rv = NS_ERROR_NULL_POINTER;
+      break;
+    }
+  }
+
+  if (NS_FAILED(rv))
+  {
+    // INVOKE message wasn't sent; clean up wrappers
+    dConnect->ReleaseWrappers(wrappers);
+    return rv;
   }
 
@@ -2431 +2444 @@
                                aParams[i].val.p, wrappers);
       if (NS_FAILED(rv))
+      {
+        // INVOKE message wasn't sent; clean up wrappers
+        dConnect->ReleaseWrappers(wrappers);
         return rv;
+      }
     }
   }