mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-05-04 07:43:44 +03:00
some fixes/updates here and there
This commit is contained in:
parent
15e6911fd8
commit
7ea3d060f6
|
@ -1139,11 +1139,6 @@ class Enumeration:
|
||||||
kb.data.cachedColumns[conf.db][conf.tbl][column] = None
|
kb.data.cachedColumns[conf.db][conf.tbl][column] = None
|
||||||
|
|
||||||
elif not kb.data.cachedColumns:
|
elif not kb.data.cachedColumns:
|
||||||
if kb.dbms == DBMS.MYSQL and not kb.data.has_information_schema:
|
|
||||||
errMsg = "information_schema not available, "
|
|
||||||
errMsg += "back-end DBMS is MySQL < 5.0"
|
|
||||||
raise sqlmapUnsupportedFeatureException, errMsg
|
|
||||||
|
|
||||||
kb.data.cachedColumns = self.getColumns(onlyColNames=True)
|
kb.data.cachedColumns = self.getColumns(onlyColNames=True)
|
||||||
|
|
||||||
if conf.col:
|
if conf.col:
|
||||||
|
@ -1248,6 +1243,7 @@ class Enumeration:
|
||||||
plusOne = False
|
plusOne = False
|
||||||
indexRange = getRange(count, dump=True, plusOne=plusOne)
|
indexRange = getRange(count, dump=True, plusOne=plusOne)
|
||||||
|
|
||||||
|
try:
|
||||||
if kb.dbms == DBMS.ACCESS:
|
if kb.dbms == DBMS.ACCESS:
|
||||||
validColumnList = False
|
validColumnList = False
|
||||||
validPivotValue = False
|
validPivotValue = False
|
||||||
|
@ -1344,6 +1340,9 @@ class Enumeration:
|
||||||
|
|
||||||
lengths[column] = max(lengths[column], len(value))
|
lengths[column] = max(lengths[column], len(value))
|
||||||
entries[column].append(value)
|
entries[column].append(value)
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
warnMsg = "Ctrl+C detected in dumping phase"
|
||||||
|
logger.warn(warnMsg)
|
||||||
|
|
||||||
for column, columnEntries in entries.items():
|
for column, columnEntries in entries.items():
|
||||||
if lengths[column] < len(column):
|
if lengths[column] < len(column):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user