Changeset 102461 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

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

Author:

vboxsync

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

160604

Message:

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

File:

• trunk/src/VBox/Additions/x11/VBoxClient/clipboard-x11.cpp (modified) (4 diffs)

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

@@ -86 +86 @@
                 if (RT_SUCCESS(rc))
                 {
+                    int               rcEvent;
                     PSHCLEVENTPAYLOAD pPayload;
-                    rc = ShClEventWait(pEvent, SHCL_TIMEOUT_DEFAULT_MS, &pPayload);
+                    rc = ShClEventWaitEx(pEvent, SHCL_TIMEOUT_DEFAULT_MS, &rcEvent, &pPayload);
                     if (RT_SUCCESS(rc))
                     {
@@ -103 +104 @@
                             ShClPayloadFree(pPayload);
                         }
+                        else /* No payload given; could happen on invalid / not-expected formats. */
+                            *pcbActual = 0;
                     }
+                    else if (rc == VERR_SHCLPB_EVENT_FAILED)
+                        rc = rcEvent;
                 }
             }
@@ -547 +552 @@
                         if (RT_SUCCESS(rc))
                         {
+                            int               rcEvent;
                             PSHCLEVENTPAYLOAD pPayload;
-                            rc = ShClEventWait(pReadDataEvent, SHCL_TIMEOUT_DEFAULT_MS, &pPayload);
+                            rc = ShClEventWaitEx(pReadDataEvent, SHCL_TIMEOUT_DEFAULT_MS, &rcEvent, &pPayload);
                             if (RT_SUCCESS(rc))
                             {
@@ -564 +570 @@
                                     ShClPayloadFree(pPayload);
                                 }
+                                else /* No payload given; could happen on invalid / not-expected formats. */
+                                    *pcbActual = 0;
                             }
+                            else if (rc == VERR_SHCLPB_EVENT_FAILED)
+                                rc = rcEvent;
                         }