diff --git a/lib/core/common.py b/lib/core/common.py index 640b04cc4..6bc0a2300 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -5012,7 +5012,7 @@ def parseRequestFile(reqFile, checkParams=True): port, request = match.groups() try: request = decodeBase64(request, binary=False) - except binascii.Error: + except (binascii.Error, TypeError): continue _ = re.search(r"%s:.+" % re.escape(HTTP_HEADER.HOST), request) if _: diff --git a/lib/core/settings.py b/lib/core/settings.py index 56fcd0a88..71cce7488 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.3.10.13" +VERSION = "1.3.10.14" 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/techniques/union/use.py b/lib/techniques/union/use.py index 6df868628..bdec4e797 100644 --- a/lib/techniques/union/use.py +++ b/lib/techniques/union/use.py @@ -123,7 +123,7 @@ def _oneShotUnionUse(expression, unpack=True, limited=False): try: decodeBase64(value) - except binascii.Error: + except (binascii.Error, TypeError): base64 = False break diff --git a/lib/utils/hash.py b/lib/utils/hash.py index 72f2f2e49..6d491b9f3 100644 --- a/lib/utils/hash.py +++ b/lib/utils/hash.py @@ -1000,7 +1000,7 @@ def dictionaryAttack(attack_dict): resumes.append((user, hash_, resumed)) keys.add(hash_) - except (binascii.Error, IndexError): + except (binascii.Error, TypeError, IndexError): pass if not attack_info: