Changeset 86374 in vbox for trunk/src/libs/xpcom18a4/ipc

Timestamp:

Oct 1, 2020 12:30:19 PM (4 years ago)

Author:

vboxsync

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

140667

Message:

xpcom/ipcdclient: Fix a few leaks detected running tstMediumLock. bugref:9841

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp (modified) (3 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp

@@ -795 +795 @@
     return rv;
 
-  ipcMessage *msg;
+  ipcMessage *msg = NULL;
 
   // send CLIENT_HELLO and wait for CLIENT_ID response...
   rv = MakeIPCMRequest(new ipcmMessageClientHello(), &msg);
   if (NS_FAILED(rv))
+  {
+#ifdef VBOX  /* MakeIPCMRequest may return a failure (e.g. NS_ERROR_CALL_FAILED) and a response msg. */
+    if (msg)
+      delete msg;
+#endif
     return rv;
+  }
 
   if (IPCM_GetType(msg) == IPCM_MSG_ACK_CLIENT_ID)
@@ -1225 +1231 @@
   NS_ENSURE_TRUE(gClientState, NS_ERROR_NOT_INITIALIZED);
 
-  ipcMessage *msg;
+  ipcMessage *msg = NULL;
 
   nsresult rv = MakeIPCMRequest(new ipcmMessageQueryClientByName(aName), &msg);
   if (NS_FAILED(rv))
+  {
+#ifdef VBOX  /* MakeIPCMRequest may return a failure (e.g. NS_ERROR_CALL_FAILED) and a response msg. */
+    if (msg)
+      delete msg;
+#endif
     return rv;
+  }
 
   if (IPCM_GetType(msg) == IPCM_MSG_ACK_CLIENT_ID)
@@ -1487 +1499 @@
   {
     NS_WARNING("message target is undefined");
-  }
-}
+#ifdef VBOX
+    delete msg;
+#endif
+  }
+}