Merge branch 'master' of github.com:sqlmapproject/sqlmap

This commit is contained in:
Bernardo Damele 2013-02-05 14:43:14 +00:00
commit 4428ad5345

View File

@ -496,7 +496,6 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
dataToStdout(filterControlChars(commonValue[index - 1:])) dataToStdout(filterControlChars(commonValue[index - 1:]))
finalValue = commonValue finalValue = commonValue
break break
# If there is a common pattern starting with partialValue, # If there is a common pattern starting with partialValue,
@ -529,7 +528,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
else: else:
val = getChar(index, asciiTbl) val = getChar(index, asciiTbl)
if val is None or (lastChar > 0 and index > lastChar): if val is None:
finalValue = partialValue finalValue = partialValue
break break
@ -548,6 +547,12 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
finalValue = partialValue[:-INFERENCE_BLANK_BREAK] finalValue = partialValue[:-INFERENCE_BLANK_BREAK]
break break
if (lastChar > 0 and index >= lastChar):
finalValue = "" if length == 0 else partialValue
finalValue = finalValue.rstrip() if len(finalValue) > 1 else finalValue
partialValue = None
break
except KeyboardInterrupt: except KeyboardInterrupt:
abortedFlag = True abortedFlag = True
finally: finally: