Changeset 69629 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp

Timestamp:

Nov 9, 2017 1:06:18 PM (7 years ago)

Author:

vboxsync

Message:

GuestHost/SharedClipboard/X11: fix a hang in the X11 clipboard.
bugref:9041: clipboard sharing on macOS host is brittle, Guest->Host direction

If our X11 clipboard code was asked for invalid formats by the other end it
could hang. Fix that.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (3 diffs)

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

@@ -1959 +1959 @@
     }
     else
+    {
         rc = VERR_NOT_IMPLEMENTED;
+        pCtx->fBusy = false;
+    }
     if (RT_FAILURE(rc))
     {
@@ -2553 +2556 @@
 }
 
+static void testBadFormatRequestFromHost(RTTEST hTest, CLIPBACKEND *pCtx)
+{
+    clipSetSelectionValues("UTF8_STRING", XA_STRING, "hello world",
+                           sizeof("hello world"), 8);
+    clipSendTargetUpdate(pCtx);
+    if (clipQueryFormats() != VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+        RTTestFailed(hTest, "Wrong targets reported: %02X\n",
+                     clipQueryFormats());
+    else
+    {
+        char *pc;
+        CLIPREADCBREQ *pReq = (CLIPREADCBREQ *)&pReq, *pReqRet = NULL;
+        ClipRequestDataFromX11(pCtx, 100, pReq);  /* Bad format. */
+        int rc = VINF_SUCCESS;
+        uint32_t cbActual = 0;
+        clipGetCompletedRequest(&rc, &pc, &cbActual, &pReqRet);
+        if (rc != VERR_NOT_IMPLEMENTED)
+            RTTestFailed(hTest, "Wrong return code, expected VERR_NOT_IMPLEMENTED, got %Rrc\n",
+                         rc);
+        clipSetSelectionValues("", XA_STRING, "", sizeof(""), 8);
+        clipSendTargetUpdate(pCtx);
+        if (clipQueryFormats() == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+            RTTestFailed(hTest, "Failed to report targets after bad host request.\n");
+    }
+}
+
 int main()
 {
@@ -2756 +2785 @@
                      (hTest, "VBox grabbed the clipboard with unknown data and we ignored it\n"));
     testStringFromVBoxFailed(hTest, pCtx, "UTF8_STRING");
+
+    /*** VBox requests a bad format ***/
+    RTTestSub(hTest, "recovery from a bad format request");
+    testBadFormatRequestFromHost(hTest, pCtx);
+
     rc = ClipStopX11(pCtx);
     AssertRCReturn(rc, 1);