Couple of patches (related to previous commit)

Author: stamparm

lib/core/convert.py

@@ -75,8 +75,8 @@ def htmlUnescape(value):
     """
     Returns (basic conversion) HTML unescaped value
 
-    >>> htmlUnescape('a<b')
-    'a<b'
+    >>> htmlUnescape('a&lt;b') == 'a<b'
+    True
     """
 
     retVal = value
@@ -87,7 +87,7 @@ def htmlUnescape(value):
             retVal = retVal.replace(code, value)
 
         try:
-            retVal = getText(re.sub(r"&#x([^ ;]+);", lambda match: _unichr(int(match.group(1), 16)), retVal))
+            retVal = re.sub(r"&#x([^ ;]+);", lambda match: _unichr(int(match.group(1), 16)), retVal)
         except ValueError:
             pass
 

lib/core/settings.py

@@ -18,7 +18,7 @@
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.3.5.159"
+VERSION = "1.3.5.160"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

lib/utils/hash.py

@@ -668,7 +668,7 @@ def attackDumpedTable():
                 value = table[column]["values"][i]
 
                 if column in binary_fields and re.search(HASH_BINARY_COLUMNS_REGEX, column) is not None:
-                    value = encodeHex(value, binary=False)
+                    value = encodeHex(getBytes(value), binary=False)
 
                 if hashRecognition(value):
                     found = True