Merge pull request #121 from GoSecure/fix_share

Fixed a case where DOSName had no nullbyte
GoSecure · Jul 2, 2019 · 6f16d65 · 6f16d65
2 parents 71d47c0 + 35d0a4f
commit 6f16d65
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pyrdp/parser/rdp/virtual_channel/device_redirection.py b/pyrdp/parser/rdp/virtual_channel/device_redirection.py
@@ -143,7 +143,11 @@ def parseDeviceAnnounce(self, stream: BytesIO) -> DeviceAnnounce:
         deviceData = stream.read(deviceDataLength)
 
         preferredDOSName = preferredDOSName.decode(errors = "ignore")[: 7]
-        endIndex = preferredDOSName.index("\x00")
+
+        try:
+            endIndex = preferredDOSName.index("\x00")
+        except ValueError:
+            endIndex = -1
 
         if endIndex >= 0:
             preferredDOSName = preferredDOSName[: endIndex]