Changeset 100482 in vbox for trunk

Timestamp:

Jul 10, 2023 5:07:44 PM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Don't alloc extra stuff in ShClTransferListEntryAlloc(), this otherwise will leak memory when using ShClTransferListEntryInit[Ex] afterwards. bugref:9437

File:

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

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

@@ -452 +452 @@
 int ShClTransferListEntryAlloc(PSHCLLISTENTRY *ppListEntry)
 {
-    PSHCLLISTENTRY pListEntry = (PSHCLLISTENTRY)RTMemAlloc(sizeof(SHCLLISTENTRY));
+    AssertPtrReturn(ppListEntry, VERR_INVALID_POINTER);
+
+    PSHCLLISTENTRY pListEntry = (PSHCLLISTENTRY)RTMemAllocZ(sizeof(SHCLLISTENTRY));
     if (!pListEntry)
         return VERR_NO_MEMORY;
 
-    int rc;
-
-    size_t cbInfo = sizeof(SHCLFSOBJINFO);
-    void  *pvInfo = RTMemAlloc(cbInfo);
-    if (pvInfo)
-    {
-        rc = ShClTransferListEntryInitEx(pListEntry, VBOX_SHCL_INFO_F_NONE, NULL /* pszName */, pvInfo, (uint32_t)cbInfo);
-        if (RT_SUCCESS(rc))
-            *ppListEntry = pListEntry;
-
-        return rc;
-    }
-    else
-        rc = VERR_NO_MEMORY;
-
-    RTMemFree(pListEntry);
-    return rc;
+    *ppListEntry = pListEntry;
+
+    return VINF_SUCCESS;
 }