minor bug fix to correctly parse unicode chars

This commit is contained in:
Bernardo Damele 2012-12-20 09:30:13 +00:00
parent 69310e47ce
commit 2b6ee06de0

View File

@ -191,7 +191,6 @@ def initCase(switches=None):
logger.debug("using output directory '%s' for this test case" % paths.SQLMAP_OUTPUT_PATH) logger.debug("using output directory '%s' for this test case" % paths.SQLMAP_OUTPUT_PATH)
LOGGER_HANDLER.stream = sys.stdout = StringIO.StringIO()
cmdLineOptions = cmdLineParser() cmdLineOptions = cmdLineParser()
cmdLineOptions.liveTest = cmdLineOptions.smokeTest = False cmdLineOptions.liveTest = cmdLineOptions.smokeTest = False
@ -210,7 +209,7 @@ def runCase(switches=None, parse=None):
initCase(switches) initCase(switches)
LOGGER_HANDLER.stream = sys.stdout = StringIO.StringIO() LOGGER_HANDLER.stream = sys.stdout = tempfile.SpooledTemporaryFile()
retVal = True retVal = True
exception = None exception = None
result = False result = False
@ -240,10 +239,12 @@ def runCase(switches=None, parse=None):
ifile.close() ifile.close()
for item, console_output in parse: for item, console_output in parse:
from lib.core.common import getUnicode
from lib.core.settings import UNICODE_ENCODING
if console_output is True: if console_output is True:
parse_on = console parse_on = getUnicode(console, UNICODE_ENCODING)
else: else:
parse_on = content parse_on = getUnicode(content, UNICODE_ENCODING)
if item.startswith("r'") and item.endswith("'"): if item.startswith("r'") and item.endswith("'"):
if not re.search(item[2:-1], parse_on, re.DOTALL): if not re.search(item[2:-1], parse_on, re.DOTALL):