Couple of minor patches

stamparm · stamparm · commit 094cfee30d9d · 2019-05-16T01:41:26.000+02:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -4551,6 +4551,8 @@ def decodeDbmsHexValue(value, raw=False):
     True
     >>> decodeDbmsHexValue(['0x31', '0x32']) == [u'1', u'2']
     True
+    >>> decodeDbmsHexValue('5.1.41') == u'5.1.41'
+    True
     """
 
     retVal = value
@@ -4559,7 +4561,7 @@ def _(value):
         retVal = value
         if value and isinstance(value, six.string_types):
             if len(value) % 2 != 0:
-                retVal = b"%s?" % decodeHex(value[:-1]) if len(value) > 1 else value
+                retVal = (decodeHex(value[:-1]) + b'?') if len(value) > 1 else value
                 singleTimeWarnMessage("there was a problem decoding value '%s' from expected hexadecimal form" % value)
             else:
                 retVal = decodeHex(value)
diff --git a/lib/core/settings.py b/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.95"
+VERSION = "1.3.5.96"
 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)
diff --git a/lib/utils/har.py b/lib/utils/har.py
@@ -154,9 +154,9 @@ def parse(cls, raw):
             stream = io.BytesIO(raw)
             first_line = stream.readline()
             parts = cls.extract_status.search(first_line)
-            status_line = b"HTTP/1.0 %s %s" % (parts.group(1), parts.group(2))
+            status_line = "HTTP/1.0 %s %s" % (getText(parts.group(1)), getText(parts.group(2)))
             remain = stream.read()
-            altered = status_line + b"\r\n" + remain
+            altered = getBytes(status_line) + b"\r\n" + remain
             comment = first_line
 
         response = _http_client.HTTPResponse(FakeSocket(altered))
