From 8ed5e88be6e95bed6ea59cb4e1d6979bc417c8e4 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 13 Mar 2019 17:20:14 +0100 Subject: [PATCH] Minor adjustments --- lib/core/common.py | 5 ++--- lib/core/settings.py | 2 +- txt/checksum.md5 | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index aef36ab16..7478bf242 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -2379,14 +2379,13 @@ def getUnicode(value, encoding=None, noneToNull=False): return value elif isinstance(value, basestring): # Heuristics (if encoding not explicitly specified) + candidates = filter(None, (encoding, kb.get("pageEncoding") if kb.get("originalPage") else None, conf.get("encoding"), UNICODE_ENCODING, sys.getfilesystemencoding())) if all(_ in value for _ in ('<', '>')): - candidates = filter(None, (encoding, kb.get("pageEncoding") if kb.get("originalPage") else None, conf.get("encoding"), sys.getfilesystemencoding(), UNICODE_ENCODING)) + pass elif any(_ in value for _ in (":\\", '/', '.')) and '\n' not in value: candidates = filter(None, (encoding, sys.getfilesystemencoding(), kb.get("pageEncoding") if kb.get("originalPage") else None, UNICODE_ENCODING, conf.get("encoding"))) elif conf.get("encoding") and '\n' not in value: candidates = filter(None, (encoding, conf.get("encoding"), kb.get("pageEncoding") if kb.get("originalPage") else None, sys.getfilesystemencoding(), UNICODE_ENCODING)) - else: - candidates = filter(None, (encoding, kb.get("pageEncoding") if kb.get("originalPage") else None, UNICODE_ENCODING, conf.get("encoding"), sys.getfilesystemencoding())) for candidate in candidates: try: diff --git a/lib/core/settings.py b/lib/core/settings.py index a2f5b678b..40d7c00c2 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.3.3.27" +VERSION = "1.3.3.28" 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 ea82150db..0b59351e8 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -30,7 +30,7 @@ c1da277517c7ec4c23e953a51b51e203 lib/controller/handler.py fb6be55d21a70765e35549af2484f762 lib/controller/__init__.py ed7874be0d2d3802f3d20184f2b280d5 lib/core/agent.py a932126e7d80e545c5d44af178d0bc0c lib/core/bigarray.py -115e73982fa4ddd498d4c7d1a26d9c5c lib/core/common.py +c775aa0369c9eb044efb5065f60a25cd lib/core/common.py de8d27ae6241163ff9e97aa9e7c51a18 lib/core/convert.py abcb1121eb56d3401839d14e8ed06b6e lib/core/data.py f89512ef3ebea85611c5dde6c891b657 lib/core/datatype.py @@ -50,7 +50,7 @@ d5ef43fe3cdd6c2602d7db45651f9ceb lib/core/readlineng.py 7d8a22c582ad201f65b73225e4456170 lib/core/replication.py 3179d34f371e0295dd4604568fb30bcd lib/core/revision.py d6269c55789f78cf707e09a0f5b45443 lib/core/session.py -d88a97d5d630efb2376bbec234f4c7bb lib/core/settings.py +7789d478c81532fe4480ceeee2498ea3 lib/core/settings.py 4483b4a5b601d8f1c4281071dff21ecc lib/core/shell.py 10fd19b0716ed261e6d04f311f6f527c lib/core/subprocessng.py d9483455ff80d33a55db46ae2fa34a05 lib/core/target.py