PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-12-07 05:01:30 +00:00
Code Issues Projects Releases Wiki Activity

fix regarding proper string isinstance checking (including unicode)

Browse Source
This commit is contained in:
Miroslav Stampar
2010-05-25 10:09:35 +00:00
parent d2c03c12fd
commit dc83f794ea
13 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/core/common.py
View File

@@ -149,7 +149,7 @@ def formatDBMSfp(versions=None):
if ( not versions or versions == [None] ) and kb.dbmsVersion and kb.dbmsVersion[0] != "Unknown":
versions = kb.dbmsVersion
if isinstance(versions, str):
if isinstance(versions, basestring):
return "%s %s" % (kb.dbms, versions)
elif isinstance(versions, (list, set, tuple)):
return "%s %s" % (kb.dbms, " and ".join([version for version in versions]))
@@ -848,7 +848,7 @@ def parseUnionPage(output, expression, partial=False, condition=None, sort=True)
else:
data = output
if len(data) == 1 and isinstance(data[0], str):
if len(data) == 1 and isinstance(data[0], basestring):
data = data[0]
return data
@@ -1019,7 +1019,7 @@ def normalizePath(path):
def safeStringFormat(formatStr, params):
retVal = formatStr.replace("%d", "%s")
if isinstance(params, str):
if isinstance(params, basestring):
retVal = retVal.replace("%s", params)
else:
count = 0