sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 17:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #3776

Browse Source
This commit is contained in:
Miroslav Stampar 2019-06-26 11:31:13 +02:00
parent 39cb938827
commit 5650e1a1a4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/settings.py
View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
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.3.6.52" VERSION = "1.3.6.53"
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)

7
plugins/generic/entries.py
View File

@ -205,6 +205,9 @@ class Entries(object):
value = inject.getValue(query, blind=False, time=False, dump=True) or "" value = inject.getValue(query, blind=False, time=False, dump=True) or ""
row.append(value) row.append(value)
if not entries and isNoneValue(row):
break
entries.append(row) entries.append(row)
except KeyboardInterrupt: except KeyboardInterrupt:
@ -213,7 +216,7 @@ class Entries(object):
warnMsg = "Ctrl+C detected in dumping phase" warnMsg = "Ctrl+C detected in dumping phase"
logger.warn(warnMsg) logger.warn(warnMsg)
if not entries and not kb.dumpKeyboardInterrupt: if isNoneValue(entries) and not kb.dumpKeyboardInterrupt:
try: try:
retVal = pivotDumpTable(table, colList, blind=False) retVal = pivotDumpTable(table, colList, blind=False)
except KeyboardInterrupt: except KeyboardInterrupt:
@ -225,7 +228,7 @@ class Entries(object):
if retVal: if retVal:
entries, _ = retVal entries, _ = retVal
entries = _zip(*[entries[colName] for colName in colList]) entries = BigArray(_zip(*[entries[colName] for colName in colList]))
else: else:
query = rootQuery.inband.query % (colString, conf.db, tbl) query = rootQuery.inband.query % (colString, conf.db, tbl)
elif Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.PGSQL, DBMS.HSQLDB, DBMS.H2): elif Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.PGSQL, DBMS.HSQLDB, DBMS.H2):