fix for a "problem" reported by Kirill Morozov (nt authority\\network service)

stamparm · stamparm · commit 84978f16c9af · 2011-06-11T07:54:59.000Z
diff --git a/extra/safe2bin/safe2bin.py b/extra/safe2bin/safe2bin.py
@@ -22,7 +22,10 @@
 HEX_ENCODED_CHAR_REGEX = r"(?P<result>\\x[0-9A-Fa-f]{2})"
 
 # Raw chars that will be safe encoded to their slash (\) representations (e.g. newline to \n)
-SAFE_ENCODE_SLASH_REPLACEMENTS = "\\\t\n\r\x0b\x0c"
+SAFE_ENCODE_SLASH_REPLACEMENTS = "\t\n\r\x0b\x0c"
+
+# String used for temporary marking of slash characters
+SLASH_MARKER = "__SLASH__"
 
 def safecharencode(value):
     """
@@ -37,9 +40,14 @@ def safecharencode(value):
     retVal = value
 
     if isinstance(value, basestring):
+
+        retVal = retVal.replace('\\', SLASH_MARKER)
+
         for char in SAFE_ENCODE_SLASH_REPLACEMENTS:
             retVal = retVal.replace(char, repr(char).strip('\''))
 
+        retVal = retVal.replace(SLASH_MARKER, '\\\\')
+
         retVal = reduce(lambda x, y: x + (y if (y in string.printable or ord(y) > 255) else '\\x%02x' % ord(y)), retVal, unicode())
 
     elif isinstance(value, list):
@@ -64,9 +72,13 @@ def safechardecode(value):
             else:
                 break
 
+        retVal = retVal.replace('\\\\', SLASH_MARKER)
+
         for char in SAFE_ENCODE_SLASH_REPLACEMENTS[::-1]:
             retVal = retVal.replace(repr(char).strip('\''), char)
 
+        retVal = retVal.replace(SLASH_MARKER, '\\')
+
     elif isinstance(value, (list, tuple)):
         for i in xrange(len(value)):
             retVal[i] = safechardecode(value[i])
