Changeset 91621 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Oct 7, 2021 8:40:03 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147345

Message:

X11/VBoxClient: Reverted most of r139955 because it's wrong and we do _need_ to write data to the host even when we failed to get it. The host would otherwise be waiting till it times out for a reply, possibly locking the host clipboard. bugref:10094

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp (modified) (1 diff)

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

@@ -158 +158 @@
 {
     LogFlowFunc(("rcCompletion=%Rrc, Format=0x%x, pv=%p, cb=%RU32\n", rcCompletion, pReq->Format, pv, cb));
-
-    if (RT_SUCCESS(rcCompletion)) /* Only write data if the request succeeded. */
-    {
-        AssertPtrReturnVoid(pv);
-        AssertReturnVoid(pv);
-
-        rcCompletion = VbglR3ClipboardWriteDataEx(&pCtx->CmdCtx, pReq->Format, pv, cb);
-    }
+    RT_NOREF(rcCompletion);
+
+    Assert((cb == 0 && pv == NULL) || (cb != 0 && pv != NULL));
+    rcCompletion = VbglR3ClipboardWriteDataEx(&pCtx->CmdCtx, pReq->Format, pv, cb);
 
     RTMemFree(pReq);