Set a default value for clipboard clipDataId, to handle non-windows c…

…lients like xfreeRDP
GoSecure · Jan 15, 2024 · ebb6222 · ebb6222
1 parent 9994d65
commit ebb6222
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pyrdp/parser/rdp/virtual_channel/clipboard.py b/pyrdp/parser/rdp/virtual_channel/clipboard.py
@@ -51,7 +51,12 @@ def parseFileContentsRequest(self, payload, msgFlags):
         posLo = Uint32LE.unpack(stream)
         posHi = Uint32LE.unpack(stream)
         cbRequested = Uint32LE.unpack(stream)
-        clipDataId = Uint32LE.unpack(stream)
+        # xfreeRDP (and maybe other non-Windows clients?) don't send a clipDataId.
+        # Currently we don't use clipDataId for anything, so we can safely just set it to 0.
+        try:
+            clipDataId = Uint32LE.unpack(stream)
+        except ValueError:
+            clipDataId = 0
 
         pos = posHi << 32 | posLo
         return FileContentsRequestPDU(payload, streamId, lindex, msgFlags, dwFlags, pos, cbRequested, clipDataId)