Changeset 69656 in vbox for trunk

Timestamp:

Nov 11, 2017 11:08:43 AM (7 years ago)

Author:

vboxsync

Message:

HostServices/SharedClipboard/X11: fix problems reported by the gcc sanitiser.
9041: clipboard sharing on macOS host is brittle, Guest->Host direction

Location:

trunk/src/VBox

Files:

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

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

@@ -920 +920 @@
 void ClipDestructX11(CLIPBACKEND *pCtx)
 {
-    /*
-     * Immediately return if we are not connected to the X server.
-     */
-    if (!pCtx->fHaveX11)
-        return;
-
-    /* We set this to NULL when the event thread exits.  It really should
-     * have exited at this point, when we are about to unload the code from
-     * memory. */
-    Assert(pCtx->widget == NULL);
+    if (pCtx->fHaveX11)
+        /* We set this to NULL when the event thread exits.  It really should
+         * have exited at this point, when we are about to unload the code from
+         * memory. */
+        Assert(pCtx->widget == NULL);
+    RTMemFree(pCtx);
 }
 
@@ -2189 +2185 @@
     }
     clipConvertX11CB(closure, pValue, count * format / 8);
+    if (pValue)
+        RTMemFree(pValue);
 }
 
@@ -2348 +2346 @@
     {
         g_completedRC = rc;
-        memcpy(g_completedBuf, pv, cb);
+        if (cb != 0)
+            memcpy(g_completedBuf, pv, cb);
     }
     else

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

@@ -260 +260 @@
                                     CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
 {
-    if (cb <= pReq->cb)
+    if (cb <= pReq->cb && cb != 0)
         memcpy(pReq->pv, pv, cb);
     RTMemFree(pReq);