Changeset 102954 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Jan 18, 2024 3:32:39 PM (13 months ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfer: Made destroying the transfers easier to use by also free'ing the object within ShClTransferDestroy(). Should also fix the memory leaks within the testcase. bugref:9437

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (4 diffs)

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

@@ -1162 +1162 @@
  *
  * @returns VBox status code.
- * @param   pTransferCtx                Clipboard transfer to destroy.
+ * @param   pTransfer           Clipboard transfer to destroy.
+ *                              The pointer will be invalid after return.
  */
 int ShClTransferDestroy(PSHCLTRANSFER pTransfer)
@@ -1195 +1196 @@
 
     ShClEventSourceDestroy(&pTransfer->Events);
+
+    RTMemFree(pTransfer);
+    pTransfer = NULL;
 
     LogFlowFuncLeave();
@@ -2679 +2683 @@
     RTListForEachSafe(&pTransferCtx->List, pTransfer, pTransferNext, SHCLTRANSFER, Node)
     {
+        shclTransferCtxTransferRemoveAndUnregister(pTransferCtx, pTransfer);
         ShClTransferDestroy(pTransfer);
-
-        shclTransferCtxTransferRemoveAndUnregister(pTransferCtx, pTransfer);
-
-        RTMemFree(pTransfer);
-        pTransfer = NULL;
     }
 
@@ -3235 +3235 @@
 
             shclTransferCtxTransferRemoveAndUnregister(pTransferCtx, pTransfer);
-
             ShClTransferDestroy(pTransfer);
-
-            RTMemFree(pTransfer);
-            pTransfer = NULL;
         }
         else