Fixing how REG_MULTI_SZ are printed to stdout (query, add) - replacin…

…g \0 with \n
fortra · Aug 6, 2024 · 7544a3e · 7544a3e
1 parent 90724a5
commit 7544a3e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/examples/reg.py b/examples/reg.py
@@ -294,6 +294,7 @@ def add(self, dce, keyName):
             if dwType == rrp.REG_MULTI_SZ:
                 vd = '\0'.join(self.__options.vd)
                 valueData = vd + 2 * '\0' # REG_MULTI_SZ ends with 2 null-bytes
+                valueDataToPrint = vd.replace('\0', '\n')
             else:
                 vd = self.__options.vd[0] if len(self.__options.vd) > 0 else ''
                 if dwType in (
@@ -307,18 +308,19 @@ def add(self, dce, keyName):
                     valueData = binascii.a2b_hex(vd.ljust(bin_value_len, '0'))
                 else:
                     valueData = vd + "\0" # Add a NULL Byte as terminator for Non Binary values
+                valueDataToPrint = valueData
 
             ans3 = rrp.hBaseRegSetValue(
                 dce, ans2['phkResult'], self.__options.v, dwType, valueData
             )
 
             if ans3['ErrorCode'] == 0:
                 print('Successfully set key %s\\%s of type %s to value %s' % (
-                    keyName, self.__options.v, self.__options.vt, valueData
+                    keyName, self.__options.v, self.__options.vt, valueDataToPrint
                 ))
             else:
                 print('Error 0x%08x while setting key %s\\%s of type %s to value %s' % (
-                    ans3['ErrorCode'], keyName, self.__options.v, self.__options.vt, valueData
+                    ans3['ErrorCode'], keyName, self.__options.v, self.__options.vt, valueDataToPrint
                 ))
 
     def delete(self, dce, keyName):
@@ -512,7 +514,7 @@ def __parse_lp_data(valueType, valueData):
                 except:
                     print(" NULL")
             elif valueType == rrp.REG_MULTI_SZ:
-                print("%s" % (valueData.decode('utf-16le')[:-2]))
+                print("%s" % (valueData.decode('utf-16le')[:-2].replace('\0', '\n')))
             else:
                 print("Unknown Type 0x%x!" % valueType)
                 hexdump(valueData)