From 4cdc3af5859b6313d440630b3d8a28d82f3987aa Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 26 Aug 2022 20:34:11 +0200 Subject: [PATCH] Fixes #5165 --- lib/core/settings.py | 2 +- lib/core/threads.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index d7b0dfdb8..a98b52018 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -20,7 +20,7 @@ from thirdparty import six from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.6.8.3" +VERSION = "1.6.8.4" 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 936c3dffa..cc0a5f572 100644 --- a/lib/core/threads.py +++ b/lib/core/threads.py @@ -161,8 +161,12 @@ def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardExceptio infoMsg = "starting %d threads" % numThreads logger.info(infoMsg) else: - _threadFunction() - return + try: + _threadFunction() + except (SqlmapUserQuitException, SqlmapSkipTargetException): + pass + finally: + return kb.multiThreadMode = True