bug fix for Ctrl+C

This commit is contained in:
Miroslav Stampar 2010-12-31 15:00:19 +00:00
parent 076560f59f
commit 91f665aaaa
2 changed files with 8 additions and 9 deletions

View File

@ -412,15 +412,15 @@ def checkSqlInjection(place, parameter, value):
if not test or test[0] in ("s", "S"): if not test or test[0] in ("s", "S"):
pass pass
elif test[0] in ("n", "N"): elif test[0] in ("n", "N"):
break return None
elif test[0] in ("e", "E"): elif test[0] in ("e", "E"):
kb.endDetection = True kb.endDetection = True
break return None
elif test[0] in ("q", "Q"): elif test[0] in ("q", "Q"):
raise sqlmapUserQuitException raise sqlmapUserQuitException
finally:
# Flush the flag # Flush the flag
kb.testMode = False kb.testMode = False
# Return the injection object # Return the injection object
if injection.place is not None and injection.parameter is not None: if injection.place is not None and injection.parameter is not None:

View File

@ -311,11 +311,11 @@ def start():
if not conf.paramDict.has_key(place): if not conf.paramDict.has_key(place):
continue continue
if not proceed:
break
paramDict = conf.paramDict[place] paramDict = conf.paramDict[place]
for parameter, value in paramDict.items(): for parameter, value in paramDict.items():
if not proceed:
break
testSqlInj = True testSqlInj = True
paramKey = (conf.hostname, conf.path, place, parameter) paramKey = (conf.hostname, conf.path, place, parameter)
@ -369,7 +369,6 @@ def start():
proceed = False proceed = False
paramKey = (conf.hostname, conf.path, None, None) paramKey = (conf.hostname, conf.path, None, None)
kb.testedParams.add(paramKey) kb.testedParams.add(paramKey)
break
else: else:
warnMsg = "%s parameter '%s' is not " % (place, parameter) warnMsg = "%s parameter '%s' is not " % (place, parameter)
warnMsg += "injectable" warnMsg += "injectable"