From e5ab678db0fab1b1e6830caf25e02f3938264ee6 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 15 Jan 2018 13:43:50 +0100 Subject: [PATCH] Fixes #2856 --- lib/core/common.py | 2 +- lib/core/settings.py | 2 +- txt/checksum.md5 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index e129d7760..ad2d46c43 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -4186,7 +4186,7 @@ def decodeHexValue(value, raw=False): except UnicodeDecodeError: pass if not isinstance(retVal, unicode): - retVal = getUnicode(retVal, "utf8") + retVal = getUnicode(retVal, conf.encoding or "utf8") return retVal diff --git a/lib/core/settings.py b/lib/core/settings.py index cd950f349..de102bdec 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS # sqlmap version (...) -VERSION = "1.2.1.8" +VERSION = "1.2.1.9" 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/txt/checksum.md5 b/txt/checksum.md5 index aa5f40b95..5583a0e75 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -27,7 +27,7 @@ a7b0c8e5a18a3abe8803999dcfc4664f lib/controller/handler.py 1e5532ede194ac9c083891c2f02bca93 lib/controller/__init__.py e3a3f5218b2e52dd0afafdfc9fed2002 lib/core/agent.py 62fade52c1524364e6e0653c31143a9c lib/core/bigarray.py -e77e4b8164602351d7e7a0fd96db30f8 lib/core/common.py +11ecba8ab05ea12e5ac4f502a437eccf lib/core/common.py 2a40d5b5997265daa890545d4a4a59b9 lib/core/convert.py 9f87391b6a3395f7f50830b391264f27 lib/core/data.py 72016ea5c994a711a262fd64572a0fcd lib/core/datatype.py @@ -46,7 +46,7 @@ ffa5f01f39b17c8d73423acca6cfe86a lib/core/readlineng.py 0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py a7db43859b61569b601b97f187dd31c5 lib/core/revision.py fcb74fcc9577523524659ec49e2e964b lib/core/session.py -cb8195e0a49997deb60e00e9abb6e5bc lib/core/settings.py +fade730caa296418caad4448c378b5f2 lib/core/settings.py d0adc28a38e43a787df4471f7f027413 lib/core/shell.py 63491be462c515a1a3880c27c2acc4a2 lib/core/subprocessng.py 505aaa61e1bba3c3d4567c3e667699e3 lib/core/target.py