Changeset 102954 in vbox for trunk/src

Timestamp:

Jan 18, 2024 3:32:39 PM (11 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

Location:

trunk/src/VBox

Files:

• GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (4 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (3 diffs)
• HostServices/SharedClipboard/testcase/tstClipboardTransfers.cpp (modified) (5 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

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

@@ -2293 +2293 @@
 
             ShClTransferCtxUnregisterById(pTxCtx, pTransfer->State.uID);
-
             ShClTransferDestroy(pTransfer);
-
-            RTMemFree(pTransfer);
-            pTransfer = NULL;
         }
     }
@@ -2343 +2339 @@
 
     if (RT_FAILURE(rc))
-    {
         ShClTransferDestroy(pTransfer);
-
-        RTMemFree(pTransfer);
-        pTransfer = NULL;
-    }
 
     if (RT_FAILURE(rc))
@@ -2383 +2374 @@
 
     ShClTransferDestroy(pTransfer);
-
-    RTMemFree(pTransfer);
     pTransfer = NULL;
 

trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardTransfers.cpp

@@ -291 +291 @@
     }
 
+    ShClTransferObjOpenParmsDestroy(&openCreateParms);
+
     rc = ShClTransferDestroy(pTransfer);
     RTTESTI_CHECK_RC_OK(rc);
@@ -310 +312 @@
     ShClEventSourceReset(&Source);
     RTTESTI_CHECK(ShClEventSourceGetLast(&Source) == NULL); /* Event still valid, but removed from the source. */
-    RTTESTI_CHECK(ShClEventRelease(pEvent) == 0);
-    RTTESTI_CHECK(ShClEventRelease(pEvent) == UINT32_MAX); /* Ref count already was 0, so returns UINT32_MAX. */
-    RTTESTI_CHECK(ShClEventRelease(pEvent) == UINT32_MAX); /* Again. */
+    RTTESTI_CHECK(ShClEventRelease(pEvent) == 0); /* Free'd event, as ref count is 0. */
     RTTESTI_CHECK(ShClEventSourceGetLast(&Source) == NULL); /* Now it should be empty. */
     RTTESTI_CHECK_RC_OK(ShClEventSourceDestroy(&Source));
@@ -325 +325 @@
     RTTESTI_CHECK(ShClEventRelease(pEvent) == 1);
     RTTESTI_CHECK(ShClEventGetRefs(pEvent) == 1);
-    RTTESTI_CHECK(ShClEventRelease(pEvent) == 0); /* Destroys event, as ref count is 0. */
-    RTTESTI_CHECK(ShClEventRelease(pEvent) == UINT32_MAX);
+    RTTESTI_CHECK(ShClEventRelease(pEvent) == 0); /* Free'd event, as ref count is 0. */
     RTTESTI_CHECK_RC_OK(ShClEventSourceDestroy(&Source)); /* Try to destruct again. */
 }
@@ -339 +338 @@
     rc = ShClTransferDestroy(pTransfer);
     RTTESTI_CHECK_RC_OK(rc);
+    pTransfer = NULL; /* Was free'd above. */
     rc = ShClTransferDestroy(pTransfer); /* Second time, intentional. */
     RTTESTI_CHECK_RC_OK(rc);
@@ -354 +354 @@
     ShClTransferListEntryDestroy(&Entry);
     ShClTransferListEntryDestroy(&Entry); /* Second time, intentional. */
+
+    rc = ShClTransferDestroy(pTransfer);
+    RTTESTI_CHECK_RC_OK(rc);
 }