PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-12-06 20:51:31 +00:00
Code Issues Projects Releases Wiki Activity

minor update

Browse Source
This commit is contained in:
Miroslav Stampar
2012-04-03 12:19:37 +00:00
parent 503988887c
commit 886aa22efc
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/generic/enumeration.py
View File

@@ -1369,11 +1369,14 @@ class Enumeration:
validColumnList = False
validPivotValue = False
if not count:
if count is None:
query = dumpNode.count % table
count = inject.getValue(query, inband=False, error=False) if blind else inject.getValue(query, blind=False)
count = inject.getValue(query, inband=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS) if blind else inject.getValue(query, blind=False, expected=EXPECTED.INT)
if count == "0":
if isinstance(count, basestring) and count.isdigit():
count = int(count)
if count == 0:
infoMsg = "table '%s' appears to be empty" % unsafeSQLIdentificatorNaming(table)
logger.info(infoMsg)
@@ -1400,9 +1403,9 @@ class Enumeration:
query = dumpNode.count2 % (column, table)
if blind:
value = inject.getValue(query, inband=False, error=False)
value = inject.getValue(query, inband=False, error=False, expected=EXPECTED.INT, charsetType=CHARSET_TYPE.DIGITS)
else:
value = inject.getValue(query, blind=False)
value = inject.getValue(query, blind=False, expected=EXPECTED.INT)
if isNumPosStrValue(value):
validColumnList = True
@@ -1424,14 +1427,14 @@ class Enumeration:
if not validPivotValue:
warnMsg = "no proper pivot column provided (with unique values)."
warnMsg += " It's not possible to retrieve all rows."
warnMsg += " It won't be possible to retrieve all rows"
logger.warn(warnMsg)
pivotValue = " "
breakRetrieval = False
try:
for i in xrange(int(count)):
for i in xrange(count):
if breakRetrieval:
break