Minor patch related to the #2856

Author: stamparm

lib/core/settings.py

@@ -19,7 +19,7 @@
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.1.12.34"
+VERSION = "1.1.12.35"
 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/request/inject.py

@@ -475,7 +475,7 @@ def getValue(expression, blind=True, union=True, error=True, time=True, fromUser
     # Dirty patch (safe-encoded unicode characters)
     if isinstance(value, unicode) and "\\x" in value:
         try:
-            candidate = eval(repr(value).replace("\\\\x", "\\x").replace("u'", "'", 1)).decode(UNICODE_ENCODING)
+            candidate = eval(repr(value).replace("\\\\x", "\\x").replace("u'", "'", 1)).decode(conf.encoding or UNICODE_ENCODING)
             if "\\x" not in candidate:
                 value = candidate
         except:

txt/checksum.md5

@@ -46,7 +46,7 @@ eec64e3d4c3f77eded3270b8116698ea  lib/core/option.py
 760d9df2a27ded29109b390ab202e72d  lib/core/replication.py
 a2466b62e67f8b31736bac4dac590e51  lib/core/revision.py
 02d4762140a72fd44668d3dab5eabda9  lib/core/session.py
-36b9c8064f31700324b8e63b7a86131b  lib/core/settings.py
+3033b491886d936a188c0bef6d2cdd6f  lib/core/settings.py
 35bffbad762eb9e03db9e93b1c991103  lib/core/shell.py
 a59ec28371ae067a6fdd8f810edbee3d  lib/core/subprocessng.py
 d93501771b41315f9fb949305b6ed257  lib/core/target.py
@@ -73,7 +73,7 @@ ad6f76839408d827abfcdc57813f8518  lib/request/direct.py
 4853bd0d523646315607a6a9a4c0b745  lib/request/dns.py
 effa0c3e4efceaf4932855e8e6677bf7  lib/request/httpshandler.py
 5fb9aaf874daa47ea2b672a22740e56b  lib/request/__init__.py
-5709fef8b9d2d95585663cfab03cba8d  lib/request/inject.py
+addfeef767fed39b715b4669a5abccae  lib/request/inject.py
 3bd06a9aff869c7aa08609fe24c63827  lib/request/methodrequest.py
 4357a294cd8aebedd00504a4ae8755c4  lib/request/pkihandler.py
 b3b351fb8d5e96f9243f7bfa3079d3c7  lib/request/rangehandler.py