mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2026-02-16 02:16:36 +00:00
fix for a bug reported by m4l1c3 (object of type 'NoneType' has no len()) and minor update
This commit is contained in:
@@ -314,10 +314,7 @@ def start():
|
||||
parameters = conf.parameters.keys()
|
||||
|
||||
# Order of testing list (last to first)
|
||||
if conf.forms or conf.data:
|
||||
orderList = (PLACE.URI, PLACE.GET, PLACE.POST)
|
||||
else:
|
||||
orderList = (PLACE.URI, PLACE.POST, PLACE.GET)
|
||||
orderList = (PLACE.URI, PLACE.GET, PLACE.POST)
|
||||
|
||||
for place in orderList:
|
||||
if place in parameters:
|
||||
@@ -334,8 +331,8 @@ def start():
|
||||
# Test Cookie header only if --level >= 2
|
||||
condition |= (place == PLACE.COOKIE and conf.level < 2)
|
||||
|
||||
# Test GET parameter in case --data and/or --forms used only if --level >= 3
|
||||
condition |= (place == PLACE.GET and (conf.data or conf.forms) and conf.level < 3)
|
||||
# Test GET parameter in case --data only if --level >= 3
|
||||
condition |= (place == PLACE.GET and conf.data and conf.level < 3)
|
||||
|
||||
condition &= not (place == PLACE.UA and intersect(USER_AGENT_ALIASES, conf.testParameter))
|
||||
condition &= not (place == PLACE.REFERER and intersect(REFERER_ALIASES, conf.testParameter))
|
||||
|
||||
@@ -166,7 +166,7 @@ class Dump:
|
||||
if isinstance(table, (list, tuple, set)):
|
||||
table = table[0]
|
||||
|
||||
maxlength = max(maxlength, len(normalizeUnicode(table)))
|
||||
maxlength = max(maxlength, len(normalizeUnicode(table) or str(table)))
|
||||
|
||||
lines = "-" * (int(maxlength) + 2)
|
||||
|
||||
@@ -186,7 +186,7 @@ class Dump:
|
||||
if isinstance(table, (list, tuple, set)):
|
||||
table = table[0]
|
||||
|
||||
blank = " " * (maxlength - len(normalizeUnicode(table)))
|
||||
blank = " " * (maxlength - len(normalizeUnicode(table) or str(table)))
|
||||
self.__write("| %s%s |" % (table, blank))
|
||||
|
||||
self.__write("+%s+\n" % lines)
|
||||
|
||||
Reference in New Issue
Block a user