Changeset 102461 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Dec 5, 2023 8:32:38 AM (14 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Make sure to check the event's rc when waiting for ShClX11ReadDataFromX11Async() to complete. bugref:10384

File:

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

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

@@ -2319 +2319 @@
     PSHCLEVENTPAYLOAD pPayload = NULL;
     size_t            cbResp   = sizeof(SHCLX11RESPONSE);
-    PSHCLX11RESPONSE  pResp    = (PSHCLX11RESPONSE)RTMemAlloc(cbResp);
+    PSHCLX11RESPONSE  pResp    = (PSHCLX11RESPONSE)RTMemAllocZ(cbResp);
     if (pResp)
     {
@@ -2615 +2615 @@
         if (RT_SUCCESS(rc))
         {
+            int               rcEvent;
             PSHCLEVENTPAYLOAD pPayload;
-            rc = ShClEventWait(pEvent, msTimeout, &pPayload);
+            rc = ShClEventWaitEx(pEvent, msTimeout, &rcEvent, &pPayload);
             if (RT_SUCCESS(rc))
             {
@@ -2632 +2633 @@
                     ShClPayloadFree(pPayload);
                 }
+                else /* No payload given; could happen on invalid / not-expected formats. */
+                    *pcbRead = 0;
             }
+            else if (rc == VERR_SHCLPB_EVENT_FAILED)
+                rc = rcEvent;
         }
     }