Changeset 103240 in vbox for trunk/src

Timestamp:

Feb 7, 2024 11:21:56 AM (15 months ago)

Author:

vboxsync

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

161526

Message:

Shared Clipboard/X11: Only allocate SHCLX11RESPONSE as event payload in clipConvertDataFromX11Worker() if we actually have data to send back. Should fix some leaks.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

@@ -2383 +2383 @@
                 pReq->Read.idxFmtX11, pReq->Read.uFmtVBox, rc));
 
-    int rc2;
-
     PSHCLEVENTPAYLOAD pPayload = NULL;
-    size_t            cbResp   = sizeof(SHCLX11RESPONSE);
-    PSHCLX11RESPONSE  pResp    = (PSHCLX11RESPONSE)RTMemAllocZ(cbResp);
-    if (pResp)
-    {
-        pResp->enmType     = SHCLX11EVENTTYPE_READ;
-        pResp->Read.pvData = pvDst;
-        pResp->Read.cbData = cbDst;
-
-        pvDst = NULL; /* The response owns the data now. */
-
-        if (   pResp->Read.pvData
-            && pResp->Read.cbData)
-        {
-            rc2 = ShClPayloadInit(0 /* ID, unused */, pResp, cbResp, &pPayload);
-            AssertRC(rc2);
-        }
-    }
-    else
-        rc = VERR_NO_MEMORY;
-
-    rc2 = ShClEventSignal(pReq->pEvent, pPayload);
+
+    if (   pvDst
+        && cbDst)
+    {
+        size_t           cbResp   = sizeof(SHCLX11RESPONSE);
+        PSHCLX11RESPONSE pResp    = (PSHCLX11RESPONSE)RTMemAllocZ(cbResp);
+        if (pResp)
+        {
+            pResp->enmType     = SHCLX11EVENTTYPE_READ;
+            pResp->Read.pvData = pvDst;
+            pResp->Read.cbData = cbDst;
+
+            pvDst = NULL; /* The response owns the data now. */
+
+            rc = ShClPayloadInit(0 /* ID, unused */, pResp, cbResp, &pPayload);
+        }
+        else
+            rc = VERR_NO_MEMORY;
+    }
+
+    /* Let the caller know in any case. */
+    int rc2 = ShClEventSignal(pReq->pEvent, pPayload);
     if (RT_SUCCESS(rc2))
         pPayload = NULL; /* The event owns the payload now. */
+
+    if (RT_SUCCESS(rc))
+        rc = rc2;
 
     if (pPayload) /* Free payload on error. */