Changeset 102464 in vbox

Timestamp:

Dec 5, 2023 8:46:15 AM (12 months ago)

Author:

vboxsync

Message:

Shared Clipboard: If something in ShClX11ReadDataFromX11Worker() fails, make sure to let the waiters know. bugref:10384

File:

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

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

@@ -2347 +2347 @@
     }
 
-    LogRel2(("Shared Clipboard: Reading X11 clipboard data completed with %Rrc\n", rc));
+    LogRel2(("Shared Clipboard: Converting X11 clipboard data completed with %Rrc\n", rc));
 
     RTMemFree(pReq);
@@ -2538 +2538 @@
     }
 
+    /* If the above stuff fails, make sure to let the waiters know.
+     *
+     * Getting the actual selection value via clipGetSelectionValue[Ex]() above will happen in the X event thread,
+     * which has its own signalling then. So this check only handles errors which happens before we put anything
+     * onto the X event thread.
+     */
+    if (RT_FAILURE(rc))
+    {
+        int rc2 = ShClEventSignalEx(pReq->pEvent, rc, NULL /* Payload */);
+        AssertRC(rc2);
+    }
+
+    LogRel2(("Shared Clipboard: Reading X11 clipboard data completed with %Rrc\n", rc));
+
     LogFlowFuncLeaveRC(rc);
 }