Changeset 5522 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/extensions

Timestamp:

Oct 26, 2007 5:21:00 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

25742

Message:

XPCOM: Fixed memory errors and leaks found by valgrind.

File:

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

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

@@ -122 +122 @@
 // dconnect minor opcodes for INVOKE
 
+#pragma pack(1)
+
 struct DConnectOp
 {
@@ -186 +188 @@
   // (see ipcDConnectService::SerializeException)
 };
+
+#pragma pack()
 
 //-----------------------------------------------------------------------------
@@ -471 +475 @@
     case nsXPTType::T_IID:
       {
-        nsID *buf = (nsID *) malloc(sizeof(nsID));
+        nsID *buf = (nsID *) nsMemory::Alloc(sizeof(nsID));
         reader.GetBytes(buf, sizeof(nsID));
         v.val.p = v.ptr = buf;
@@ -489 +493 @@
         else
         {
-          char *buf = (char *) malloc(len + 1);
+          char *buf = (char *) nsMemory::Alloc(len + 1);
           reader.GetBytes(buf, len);
           buf[len] = char(0);
@@ -510 +514 @@
         else
         {
-          PRUnichar *buf = (PRUnichar *) malloc(len + 2);
+          PRUnichar *buf = (PRUnichar *) nsMemory::Alloc(len + 2);
           reader.GetBytes(buf, len);
           buf[len / 2] = PRUnichar(0);
@@ -621 +625 @@
     v.type = t;
     v.flags = nsXPTCVariant::PTR_IS_DATA;
+
+    // nsID, string and wstring types are not understood as dippers (see
+    // DIPPER_TYPE in xpidl.h) but they behave like dippers too. Therefore we
+    // need to treat them so manually.
+    switch (t.TagPart())
+    {
+      case nsXPTType::T_IID:
+      case nsXPTType::T_CHAR_STR:
+      case nsXPTType::T_WCHAR_STR:
+        // add VAL_IS_ALLOCD to cause FinishParam() to do cleanup
+        v.flags |= nsXPTCVariant::VAL_IS_ALLOCD;
+        break;
+      default:
+        break;
+    }
   }
 
@@ -633 +652 @@
 
   if (v.IsValAllocated())
-    free(v.val.p);
+      nsMemory::Free(v.val.p);
   else if (v.IsValInterface())
     ((nsISupports *) v.val.p)->Release();
@@ -1786 +1805 @@
 
     // check if this object is nsISupports itself
-    nsIID *iid = 0;
-    rv = mIInfo->GetInterfaceIID(&iid);
-    NS_ASSERTION(NS_SUCCEEDED(rv) && iid,
-                 "nsIInterfaceInfo::GetInterfaceIID failed");
-    if (NS_SUCCEEDED(rv) && iid &&
-        iid->Equals(NS_GET_IID(nsISupports)))
-    {
-      // nsISupports is queried on nsISupports, return ourselves
-      *aInstancePtr = this;
-      NS_ADDREF_THIS();
-      // cache ourselves weakly
-      mCachedISupports = this;
-
-      PR_Unlock(dConnect->StubQILock());
-      return NS_OK;
+    {
+      nsIID *iid = 0;
+      rv = mIInfo->GetInterfaceIID(&iid);
+      NS_ASSERTION(NS_SUCCEEDED(rv) && iid,
+                   "nsIInterfaceInfo::GetInterfaceIID failed");
+      if (NS_SUCCEEDED(rv) && iid &&
+          iid->Equals(NS_GET_IID(nsISupports)))
+      {
+        nsMemory::Free((void*)iid);
+
+        // nsISupports is queried on nsISupports, return ourselves
+        *aInstancePtr = this;
+        NS_ADDREF_THIS();
+        // cache ourselves weakly
+        mCachedISupports = this;
+
+        PR_Unlock(dConnect->StubQILock());
+        return NS_OK;
+      }
+      if (iid)
+        nsMemory::Free((void*)iid);
     }