diff --git a/lib/core/common.py b/lib/core/common.py index bb749e7af..14dba1d5a 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -2122,16 +2122,11 @@ def getConsoleWidth(default=80): width = int(os.getenv("COLUMNS")) else: try: - try: - FNULL = open(os.devnull, 'w') - except IOError: - FNULL = None - process = subprocess.Popen("stty size", shell=True, stdout=subprocess.PIPE, stderr=FNULL or subprocess.PIPE) - stdout, _ = process.communicate() - items = stdout.split() + output = shellExec("stty size") + match = re.search(r"\A\d+ (\d+)", output) - if len(items) == 2 and items[1].isdigit(): - width = int(items[1]) + if match: + width = int(match.group(1)) except (OSError, MemoryError): pass diff --git a/lib/core/settings.py b/lib/core/settings.py index a2044ca44..68696d1a7 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty import six # sqlmap version (...) -VERSION = "1.3.5.86" +VERSION = "1.3.5.87" 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)