Changeset 100405 in vbox

Timestamp:

Jul 6, 2023 10:13:38 AM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Relaxed transfer status checks a bit when reading the transfer root list. ​​​bugref:9437

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (1 diff)
• GuestHost/SharedClipboard/clipboard-transfers.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

@@ -818 +818 @@
     AssertPtrReturn(pTransfer, VERR_INVALID_POINTER);
 
-    AssertMsgReturn(ShClTransferGetStatus(pTransfer) == SHCLTRANSFERSTATUS_INITIALIZED,
-                    ("Can't read root list -- wrong transfer status\n"), VERR_WRONG_ORDER);
+    SHCLTRANSFERSTATUS const enmSts = ShClTransferGetStatus(pTransfer);
+    AssertMsgReturn(   enmSts == SHCLTRANSFERSTATUS_INITIALIZED
+                    || enmSts == SHCLTRANSFERSTATUS_STARTED,
+                    ("Can't read root list -- wrong transfer status (%#x)\n", enmSts), VERR_WRONG_ORDER);
 
     SHCLLISTHDR Hdr;

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

@@ -1704 +1704 @@
 #ifdef DEBUG
     shClTransferLock(pTransfer);
-    AssertMsgReturn(pTransfer->State.enmStatus == SHCLTRANSFERSTATUS_INITIALIZED,
+    AssertMsgReturn(   pTransfer->State.enmStatus == SHCLTRANSFERSTATUS_INITIALIZED
+                    || pTransfer->State.enmStatus == SHCLTRANSFERSTATUS_STARTED,
                     ("Cannot read root list in status %s\n", ShClTransferStatusToStr(pTransfer->State.enmStatus)),
                     VERR_WRONG_ORDER);