From 9a2cdd4b59187ad3f32f0ae2db80d6fb1177dd8f Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 13 Dec 2017 13:22:42 +0100 Subject: [PATCH] Potential patch for #2826 --- lib/core/common.py | 4 ++-- lib/core/settings.py | 2 +- txt/checksum.md5 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 5f6445e97..67cef166f 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -3809,7 +3809,7 @@ def randomizeParameterValue(value): @cachedmethod def asciifyUrl(url, forceQuote=False): """ - Attempts to make a unicode URL usuable with ``urllib/urllib2``. + Attempts to make a unicode URL usable with ``urllib/urllib2``. More specifically, it attempts to convert the unicode object ``url``, which is meant to represent a IRI, to an unicode object that, @@ -3874,7 +3874,7 @@ def asciifyUrl(url, forceQuote=False): if port: netloc += ':' + str(port) - return urlparse.urlunsplit([parts.scheme, netloc, path, query, parts.fragment]) + return urlparse.urlunsplit([parts.scheme, netloc, path, query, parts.fragment]) or url def isAdminFromPrivileges(privileges): """ diff --git a/lib/core/settings.py b/lib/core/settings.py index 0b2b32c6e..7116a72df 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.1.12.17" +VERSION = "1.1.12.18" 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 2f53d854d..8dc17ec4d 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -27,7 +27,7 @@ d2cdb9e832e18a81e936ca3348144b16 lib/controller/handler.py 5fb9aaf874daa47ea2b672a22740e56b lib/controller/__init__.py f8a7165253874a9ce0c6e0d089e5fb8c lib/core/agent.py 9eccf8db8b8e259e30c1eade4ee499b0 lib/core/bigarray.py -d359917cd034d4d353cfd699bd201693 lib/core/common.py +8b9d75682900c0dc73dbe85293cd41ac lib/core/common.py 54326d3a690f8b26fe5a5da1a589b369 lib/core/convert.py 90b1b08368ac8a859300e6fa6a8c796e lib/core/data.py 1c14bdbf47b8dba31f73da9ad731a54a lib/core/datatype.py @@ -46,7 +46,7 @@ f872699e948d0692ce11b54781da814c lib/core/log.py 760d9df2a27ded29109b390ab202e72d lib/core/replication.py a2466b62e67f8b31736bac4dac590e51 lib/core/revision.py 02d4762140a72fd44668d3dab5eabda9 lib/core/session.py -eed5329e23cee75adb1e14f825d29192 lib/core/settings.py +92cc67e770d2a170ab982f1d9d8ad3ed lib/core/settings.py 35bffbad762eb9e03db9e93b1c991103 lib/core/shell.py a59ec28371ae067a6fdd8f810edbee3d lib/core/subprocessng.py d93501771b41315f9fb949305b6ed257 lib/core/target.py