Minor patch

This commit is contained in:
Miroslav Stampar 2023-02-20 15:08:49 +01:00
parent 15d9c8f9ed
commit 1f82d9587a
2 changed files with 11 additions and 7 deletions

View File

@ -20,7 +20,7 @@ from thirdparty import six
from thirdparty.six import unichr as _unichr from thirdparty.six import unichr as _unichr
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.7.2.11" VERSION = "1.7.2.12"
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} 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) VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

View File

@ -8,6 +8,7 @@ See the file 'LICENSE' for copying permission
from __future__ import print_function from __future__ import print_function
import difflib import difflib
import sqlite3
import threading import threading
import time import time
import traceback import traceback
@ -227,16 +228,19 @@ def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardExceptio
if conf.get("verbose") > 1 and isinstance(ex, SqlmapValueException): if conf.get("verbose") > 1 and isinstance(ex, SqlmapValueException):
traceback.print_exc() traceback.print_exc()
except: except Exception as ex:
print() print()
if not kb.multipleCtrlC: if not kb.multipleCtrlC:
from lib.core.common import unhandledExceptionMessage if isinstance(ex, sqlite3.Error):
raise
else:
from lib.core.common import unhandledExceptionMessage
kb.threadException = True kb.threadException = True
errMsg = unhandledExceptionMessage() errMsg = unhandledExceptionMessage()
logger.error("thread %s: %s" % (threading.currentThread().getName(), errMsg)) logger.error("thread %s: %s" % (threading.currentThread().getName(), errMsg))
traceback.print_exc() traceback.print_exc()
finally: finally:
kb.multiThreadMode = False kb.multiThreadMode = False