Changeset 85762 in vbox

Timestamp:

Aug 14, 2020 10:55:03 AM (4 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Also free X11 CLIPREADCBREQ in ShClBackendReadData() on error.

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (2 diffs)

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

@@ -2328 +2328 @@
  * @param   pCtx                Context data for the clipboard backend.
  * @param   Format              The format that the VBox would like to receive the data in.
- * @param   pReq                Read callback request to use. Must be free'd in the callback.
+ * @param   pReq                Read callback request to use. Will be free'd in the callback on success.
+ *                              Otherwise the caller has to free this again on error.
  *
  * @note   We allocate a request structure which must be freed by the worker.

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp

@@ -197 +197 @@
         if (idEvent != NIL_SHCLEVENTID)
         {
+            /* Note: ShClX11ReadDataFromX11() will consume pReq on success. */
             rc = ShClX11ReadDataFromX11(&pClient->State.pCtx->X11, uFormat, pReq);
             if (RT_SUCCESS(rc))
@@ -215 +216 @@
         }
         else
-        {
+            rc = VERR_SHCLPB_MAX_EVENTS_REACHED;
+
+        if (RT_FAILURE(rc))
             RTMemFree(pReq);
-            rc = VERR_SHCLPB_MAX_EVENTS_REACHED;
-        }
     }
     else