Changeset 103563 in vbox

Timestamp:

Feb 26, 2024 11:31:39 AM (9 months ago)

Author:

vboxsync

Message:

libs/xpcom: Replace some nsMemory:: calls to RTMemAlloc/RTMemFree to get more accurate memory tracking with the IPRT memory tracker, buref:10598

File:

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

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

@@ -503 +503 @@
     case nsXPTType::T_IID:
       {
-        nsID *buf = (nsID *) nsMemory::Alloc(sizeof(nsID));
+        nsID *buf = (nsID *)RTMemAlloc(sizeof(nsID));
         IPCMsgReaderReadBytes(pMsgReader, buf, sizeof(nsID));
         v.val.p = buf;
@@ -520 +520 @@
         else
         {
-          char *buf = (char *) nsMemory::Alloc(len + 1);
+          char *buf = (char *)RTMemAlloc(len + 1);
           IPCMsgReaderReadBytes(pMsgReader, buf, len);
           buf[len] = char(0);
@@ -540 +540 @@
         else
         {
-          PRUnichar *buf = (PRUnichar *) nsMemory::Alloc(len + 2);
+          PRUnichar *buf = (PRUnichar *)RTMemAlloc(len + 2);
           IPCMsgReaderReadBytes(pMsgReader, buf, len);
           buf[len / 2] = PRUnichar(0);
@@ -686 +686 @@
 
   if (v.IsValAllocated())
-    nsMemory::Free(v.val.p);
+    RTMemFree(v.val.p);
   else if (v.IsValInterface())
     ((nsISupports *) v.val.p)->Release();
@@ -745 +745 @@
     case nsXPTType::T_IID:
       {
-        nsID *buf = (nsID *) nsMemory::Alloc(sizeof(nsID));
+        nsID *buf = (nsID *)RTMemAlloc(sizeof(nsID));
         IPCMsgReaderReadBytes(pMsgReader, buf, sizeof(nsID));
         *((nsID **) v.val.p) = buf;
@@ -765 +765 @@
         else
         {
-          char *buf = (char *) nsMemory::Alloc(len + 1);
+          char *buf = (char *)RTMemAlloc(len + 1);
           IPCMsgReaderReadBytes(pMsgReader, buf, len);
           buf[len] = char(0);
@@ -788 +788 @@
         else
         {
-          PRUnichar *buf = (PRUnichar *) nsMemory::Alloc(len + 2);
+          PRUnichar *buf = (PRUnichar *)RTMemAlloc(len + 2);
           IPCMsgReaderReadBytes(pMsgReader, buf, len);
           buf[len / 2] = PRUnichar(0);
@@ -803 +803 @@
         // deserialize the DConAddr and the original value of v.val.p
         // into v.val.p temporarily.  needs temporary memory alloc.
-        DConAddrPlusPtr *buf = (DConAddrPlusPtr *) nsMemory::Alloc(sizeof(DConAddrPlusPtr));
+        DConAddrPlusPtr *buf = (DConAddrPlusPtr *)RTMemAlloc(sizeof(DConAddrPlusPtr));
         IPCMsgReaderReadBytes(pMsgReader, &buf->addr, sizeof(DConAddr));
         buf->p = v.val.p;
@@ -1107 +1107 @@
   // malloc(0) returns a null pointer or not (which is used in isNull())
   // is implementation-dependent according to the C standard
-  void *arr = nsMemory::Alloc((size ? size : 1) * elemSize);
+  void *arr = RTMemAlloc((size ? size : 1) * elemSize);
   if (arr == nsnull)
     return NS_ERROR_OUT_OF_MEMORY;
@@ -1161 +1161 @@
 
   if (NS_FAILED(rv))
-    nsMemory::Free(arr);
+    RTMemFree(arr);
   else
     array = arr;
@@ -2408 +2408 @@
           iid->Equals(NS_GET_IID(nsISupports)))
       {
-        nsMemory::Free((void*)iid);
+        RTMemFree((void*)iid);
 
         // nsISupports is queried on nsISupports, return ourselves
@@ -2420 +2420 @@
       }
       if (iid)
-        nsMemory::Free((void*)iid);
+        RTMemFree((void*)iid);
     }
 
@@ -2678 +2678 @@
           PtrBits bits = dptr->addr;
           aParams[i].val.p = dptr->p;
-          nsMemory::Free((void *)dptr);
+          RTMemFree((void *)dptr);
 
           // DeserializeInterfaceParamBits needs IID only if it's a remote object
@@ -3697 +3697 @@
   Log(("  request-index=%d\n", (PRUint32) invoke->request_index));
 
-  params = new nsXPTCVariant[paramCount];
+  params = (nsXPTCVariant *)RTMemAllocZ(sizeof(nsXPTCVariant) * paramCount);
   if (!params)
   {
@@ -3915 +3915 @@
     for (i=0; i<paramUsed; ++i)
       FinishParam(params[i]);
-    delete[] params;
-  }
-}
+    RTMemFree(params);
+  }
+}