sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-25 11:03:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix regarding bug discovered by Andreas Constantinides

Browse Source
This commit is contained in:
Miroslav Stampar 2010-06-04 17:07:17 +00:00
parent 7fbeebc4d9
commit 9e76b847b3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/core/common.py
View File

@ -451,7 +451,7 @@ def readInput(message, default=None):
message += "\n> " message += "\n> "
if conf.batch and default: if conf.batch and default:
infoMsg = "%s%s" % (message, unicode(default)) infoMsg = "%s%s" % (message, getUnicode(default))
logger.info(infoMsg) logger.info(infoMsg)
debugMsg = "used the default behaviour, running in batch mode" debugMsg = "used the default behaviour, running in batch mode"
@ -517,7 +517,7 @@ def sanitizeStr(inpStr):
@rtype: C{str} @rtype: C{str}
""" """
cleanString = unicode(inpStr) cleanString = getUnicode(inpStr)
cleanString = cleanString.replace("\n", " ").replace("\r", "") cleanString = cleanString.replace("\n", " ").replace("\r", "")
return cleanString return cleanString
@ -1032,7 +1032,7 @@ def safeStringFormat(formatStr, params):
if index != -1: if index != -1:
if count < len(params): if count < len(params):
retVal = retVal[:index] + unicode(params[count]) + retVal[index+2:] retVal = retVal[:index] + getUnicode(params[count]) + retVal[index+2:]
else: else:
raise sqlmapNoneDataException, "wrong number of parameters during string formatting" raise sqlmapNoneDataException, "wrong number of parameters during string formatting"
count += 1 count += 1
@ -1109,7 +1109,7 @@ def profile(profileOutputFile=None, dotOutputFile=None, imageOutputFile=None):
import gtk import gtk
import pydot import pydot
except ImportError, e: except ImportError, e:
errMsg = "profiling requires third-party libraries (%s)" % unicode(e) errMsg = "profiling requires third-party libraries (%s)" % getUnicode(e)
logger.error(errMsg) logger.error(errMsg)
return return
@ -1370,7 +1370,7 @@ class UnicodeRawConfigParser(RawConfigParser):
if self._defaults: if self._defaults:
fp.write("[%s]\n" % DEFAULTSECT) fp.write("[%s]\n" % DEFAULTSECT)
for (key, value) in self._defaults.items(): for (key, value) in self._defaults.items():
fp.write("%s = %s\n" % (key, unicode(value).replace('\n', '\n\t'))) fp.write("%s = %s\n" % (key, getUnicode(value).replace('\n', '\n\t')))
fp.write("\n") fp.write("\n")
for section in self._sections: for section in self._sections:
fp.write("[%s]\n" % section) fp.write("[%s]\n" % section)
@ -1380,5 +1380,5 @@ class UnicodeRawConfigParser(RawConfigParser):
fp.write("%s\n" % (key)) fp.write("%s\n" % (key))
else: else:
fp.write("%s = %s\n" % fp.write("%s = %s\n" %
(key, unicode(value).replace('\n', '\n\t'))) (key, getUnicode(value).replace('\n', '\n\t')))
fp.write("\n") fp.write("\n")