Fixing 2x null-bytes handling for REG_MULTI_SZ values in rrp.py

fortra · Aug 5, 2024 · 170b542 · 170b542
1 parent a6e0683
commit 170b542
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/impacket/dcerpc/v5/rrp.py b/impacket/dcerpc/v5/rrp.py
@@ -702,7 +702,11 @@ def packValue(valueType, value):
             retData = value.decode(sys.getfilesystemencoding()).encode('utf-16le')
     elif valueType == REG_MULTI_SZ:
         try:
-            retData = (checkNullString(value)+'\x00').encode('utf-16le')
+            # REG_MULTI_SZ must end with 2 null-bytes
+            v = checkNullString(value)
+            if v[-2:] != '\x00':
+                v = v + '\x00'
+            retData = v.encode('utf-16le')
         except UnicodeDecodeError:
             import sys
             retData = value.decode(sys.getfilesystemencoding()).encode('utf-16le')