sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-07-16 11:12:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor bug fix

Browse Source
This commit is contained in:
Miroslav Stampar 2011-12-12 14:38:06 +00:00
parent 25cde9e2c7
commit 73a500833d
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/core/common.py
View File

@ -1338,7 +1338,7 @@ def getRange(count, dump=False, plusOne=False):
return indexRange return indexRange
def parseUnionPage(output, expression, partial=False, condition=None, sort=True): def parseUnionPage(output, expression, partial=False, sort=True):
if output is None: if output is None:
return None return None
@ -1354,15 +1354,6 @@ def parseUnionPage(output, expression, partial=False, condition=None, sort=True)
regExpr = '%s(.*?)%s' % (DUMP_START_MARKER, DUMP_STOP_MARKER) regExpr = '%s(.*?)%s' % (DUMP_START_MARKER, DUMP_STOP_MARKER)
output = re.findall(regExpr, output, re.DOTALL | re.IGNORECASE) output = re.findall(regExpr, output, re.DOTALL | re.IGNORECASE)
if condition is None:
condition = (
kb.resumedQueries and conf.url in kb.resumedQueries.keys()
and expression in kb.resumedQueries[conf.url].keys()
)
if partial or not condition:
logOutput = "".join("%s%s%s" % (DUMP_START_MARKER, replaceNewlineTabs(value), DUMP_STOP_MARKER) for value in output)
dataToSessionFile("[%s][%s][%s][%s][%s]\n" % (conf.url, kb.injection.place, conf.parameters[kb.injection.place], expression, logOutput))
if sort: if sort:
dict_ = {} dict_ = {}

2
lib/request/inject.py
View File

@ -384,7 +384,7 @@ def __goInband(expression, expected=None, sort=True, resumeValue=True, unpack=Tr
if isinstance(output, list): if isinstance(output, list):
data = output data = output
else: else:
data = parseUnionPage(output, expression, partial, None, sort) data = parseUnionPage(output, expression, partial, sort)
return data return data