minor cosmetics

This commit is contained in:
Miroslav Stampar 2010-12-15 12:34:14 +00:00
parent 445cc3bf3c
commit 3f34b06a24

View File

@ -427,7 +427,7 @@ def getValue(expression, blind=True, inband=True, error=True, time=True, fromUse
found = value or (value is None and expectingNone) found = value or (value is None and expectingNone)
oldParamNegative = kb.unionNegative pushValue(kb.unionNegative)
kb.unionNegative = False kb.unionNegative = False
if error and isTechniqueAvailable(PAYLOAD.TECHNIQUE.ERROR) and not found: if error and isTechniqueAvailable(PAYLOAD.TECHNIQUE.ERROR) and not found:
@ -461,7 +461,7 @@ def getValue(expression, blind=True, inband=True, error=True, time=True, fromUse
else: else:
value = __goInferenceProxy(query, fromUser, expected, batch, resumeValue, unpack, charsetType, firstChar, lastChar) value = __goInferenceProxy(query, fromUser, expected, batch, resumeValue, unpack, charsetType, firstChar, lastChar)
kb.unionNegative = oldParamNegative kb.unionNegative = popValue()
if value and isinstance(value, basestring): if value and isinstance(value, basestring):
value = value.strip() value = value.strip()
@ -469,15 +469,14 @@ def getValue(expression, blind=True, inband=True, error=True, time=True, fromUse
errMsg = "none of the injection types identified can be " errMsg = "none of the injection types identified can be "
errMsg += "leveraged to retrieve queries output" errMsg += "leveraged to retrieve queries output"
raise sqlmapNotVulnerableException, errMsg raise sqlmapNotVulnerableException, errMsg
finally: finally:
if suppressOutput: if suppressOutput:
conf.verbose = popValue() conf.verbose = popValue()
if value and expected == EXPECTED.BOOL: if value and expected == EXPECTED.BOOL:
if isinstance(value, basestring): if isinstance(value, basestring):
value = value.lower() if value.lower() in ("true", "false"):
if value in ("true", "false"):
value = bool(value) value = bool(value)
else: else:
value = value != "0" value = value != "0"