Changeset 101721 in vbox

Timestamp:

Nov 2, 2023 3:23:58 PM (15 months ago)

Author:

vboxsync

Message:

Additions: X11/Wayland: Clipboard: fix memory zeroing on realloc (plus small refactoring), bugref:10194.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• clipboard-common.cpp (modified) (5 diffs)
• clipboard.h (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard-common.cpp

@@ -58 +58 @@
 }
 
-RTDECL(int) VBClClipboardReadHostEvent(PSHCLCONTEXT pCtx, const PFNHOSTCLIPREPORTFMTS pfnReportHostFmts,
-                                       const PFNHOSTCLIPREAD pfnReadGuestFmt)
+RTDECL(int) VBClClipboardReadHostEvent(PSHCLCONTEXT pCtx, const PFNHOSTCLIPREPORTFMTS pfnHGClipReport,
+                                       const PFNHOSTCLIPREAD pfnGHClipRead)
 {
     int rc;
@@ -66 +66 @@
     uint32_t cParms = 0;
 
-    AssertPtrReturn(pfnReportHostFmts, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pfnReadGuestFmt, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pfnHGClipReport, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pfnGHClipRead, VERR_INVALID_PARAMETER);
 
     PVBGLR3CLIPBOARDEVENT pEvent = (PVBGLR3CLIPBOARDEVENT)RTMemAllocZ(sizeof(VBGLR3CLIPBOARDEVENT));
@@ -83 +83 @@
             case VBGLR3CLIPBOARDEVENTTYPE_REPORT_FORMATS:
             {
-                rc = pfnReportHostFmts(pEvent->u.fReportedFormats);
+                rc = pfnHGClipReport(pEvent->u.fReportedFormats);
                 break;
             }
@@ -90 +90 @@
             case VBGLR3CLIPBOARDEVENTTYPE_READ_DATA:
             {
-                rc = pfnReadGuestFmt(pEvent->u.fReadData);
+                rc = pfnGHClipRead(pEvent->u.fReadData);
                 break;
             }
@@ -131 +131 @@
         {
             /* cbRead contains the size required. */
-
+            pvData = RTMemReallocZ(pvData, cbData, cbRead);
             cbData = cbRead;
-            pvData = RTMemReallocZ(pvData, cbRead, cbRead);
             if (pvData)
             {

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.h

@@ -99 +99 @@
  * @returns VBox status code.
  * @param   pCtx                Host Shared Clipboard service connection context.
- * @param   pfnReportHostFmts   A callback to notify guest about new content in host clipboard.
- * @param   pfnReadGuestFmt     A callback to notify guest when host requests guest clipboard content.
+ * @param   pfnHGClipReport     A callback to notify guest about new content in host clipboard.
+ * @param   pfnGHClipRead       A callback to notify guest when host requests guest clipboard content.
  */
-extern RTDECL(int) VBClClipboardReadHostEvent(PSHCLCONTEXT pCtx, const PFNHOSTCLIPREPORTFMTS pfnReportHostFmts,
-                                              const PFNHOSTCLIPREAD pfnReadGuestFmt);
+extern RTDECL(int) VBClClipboardReadHostEvent(PSHCLCONTEXT pCtx, const PFNHOSTCLIPREPORTFMTS pfnHGClipReport,
+                                              const PFNHOSTCLIPREAD pfnGHClipRead);
 
 /**