From eb14f296f6238de3b8a66a50245e7f15c2d86376 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 12 Jul 2019 13:41:07 +0200 Subject: [PATCH] Fixes #3820 --- lib/core/settings.py | 2 +- lib/core/threads.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 951a45d9f..8a0c1a9e6 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.7.20" +VERSION = "1.3.7.21" 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/core/threads.py b/lib/core/threads.py index 946a22c20..234424f95 100644 --- a/lib/core/threads.py +++ b/lib/core/threads.py @@ -95,8 +95,10 @@ def exceptionHandledFunction(threadFunction, silent=False): kb.threadException = True raise except Exception as ex: + from lib.core.common import getSafeExString + if not silent and kb.get("threadContinue"): - errMsg = ex.message if isinstance(ex, SqlmapBaseException) else "%s: %s" % (type(ex).__name__, ex.message) + errMsg = getSafeExString(ex) if isinstance(ex, SqlmapBaseException) else "%s: %s" % (type(ex).__name__, getSafeExString(ex)) logger.error("thread %s: '%s'" % (threading.currentThread().getName(), errMsg)) if conf.get("verbose") > 1 and not isinstance(ex, (SqlmapUserQuitException, SqlmapConnectionException)):