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

fix for a crash with partial union and --hex

Browse Source
This commit is contained in:
Miroslav Stampar 2012-03-14 10:31:24 +00:00
parent a7fbc55748
commit 61ad3b999a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/core/common.py
View File

@ -1245,7 +1245,6 @@ def parseUnionPage(output, unique=True):
for entry in output: for entry in output:
entry = entry.group(1) entry = entry.group(1)
entry = decodeHexValue(entry) if conf.hexConvert else entry
if unique: if unique:
key = entry.lower() key = entry.lower()
@ -1256,9 +1255,14 @@ def parseUnionPage(output, unique=True):
else: else:
continue continue
entry = safecharencode(entry) if kb.safeCharEncode else entry
entry = entry.split(kb.chars.delimiter) entry = entry.split(kb.chars.delimiter)
if conf.hexConvert:
entry = applyFunctionRecursively(entry, decodeHexValue)
if kb.safeCharEncode:
entry = applyFunctionRecursively(entry, safecharencode)
data.append(entry[0] if len(entry) == 1 else entry) data.append(entry[0] if len(entry) == 1 else entry)
else: else:
data = output data = output

2
lib/takeover/web.py
View File

@ -136,7 +136,7 @@ class Web:
logger.info(infoMsg) logger.info(infoMsg)
default = None default = None
choices = ['asp', 'aspx', 'php', 'jsp'] choices = ('asp', 'aspx', 'php', 'jsp')
for ext in choices: for ext in choices:
if conf.url.endswith(ext): if conf.url.endswith(ext):