diff --git a/lib/core/common.py b/lib/core/common.py index 1772aa2ef..3ce4211fa 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1018,16 +1018,16 @@ def readInput(message, default=None, checkBatch=True, boolean=False): retVal = default else: - logging._acquireLock() - - if conf.get("beep"): - beep() - - dataToStdout("\r%s" % message, forceOutput=True, bold=True) - kb.prependFlag = False - try: - retVal = raw_input() or default + logging._acquireLock() + + if conf.get("beep"): + beep() + + dataToStdout("\r%s" % message, forceOutput=True, bold=True) + kb.prependFlag = False + + retVal = raw_input().strip() or default retVal = getUnicode(retVal, encoding=sys.stdin.encoding) if retVal else retVal except: try: diff --git a/lib/core/settings.py b/lib/core/settings.py index dd0d306d9..7aba94181 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.11.30" +VERSION = "1.1.11.31" 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 144048337..f983e5dcd 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -27,7 +27,7 @@ d2cdb9e832e18a81e936ca3348144b16 lib/controller/handler.py 5fb9aaf874daa47ea2b672a22740e56b lib/controller/__init__.py fd69e56ce20a5a49ce10a7a745022378 lib/core/agent.py 8d9d771f7e67582c56a96a8d0ccbe4fc lib/core/bigarray.py -9552921b3ac6f22c5ad86091e1d36512 lib/core/common.py +cafe808491a543b7838a3d33dbd7c2a1 lib/core/common.py 54326d3a690f8b26fe5a5da1a589b369 lib/core/convert.py 90b1b08368ac8a859300e6fa6a8c796e lib/core/data.py 1c14bdbf47b8dba31f73da9ad731a54a lib/core/datatype.py @@ -46,7 +46,7 @@ e1c000db9be27f973569b1a430629037 lib/core/option.py 760d9df2a27ded29109b390ab202e72d lib/core/replication.py a2466b62e67f8b31736bac4dac590e51 lib/core/revision.py 02d4762140a72fd44668d3dab5eabda9 lib/core/session.py -2b10657f34c5a7e27287a1060002f778 lib/core/settings.py +74e9355e0e0d3672b20cf87b7f94f8ce lib/core/settings.py 35bffbad762eb9e03db9e93b1c991103 lib/core/shell.py a59ec28371ae067a6fdd8f810edbee3d lib/core/subprocessng.py d5a04d672a18f78deb2839c3745ff83c lib/core/target.py