From e3650342bd815526a2c1e560ba1ea48c4ba55440 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 8 Jan 2016 11:47:12 +0100 Subject: [PATCH] Fixes #1639 --- lib/core/convert.py | 2 ++ lib/techniques/error/use.py | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/core/convert.py b/lib/core/convert.py index 8af9371d0..00db9fea1 100644 --- a/lib/core/convert.py +++ b/lib/core/convert.py @@ -8,6 +8,7 @@ See the file 'doc/COPYING' for copying permission import base64 import json import pickle +import re import StringIO import sys import types @@ -159,6 +160,7 @@ def htmlunescape(value): if value and isinstance(value, basestring): codes = (('<', '<'), ('>', '>'), ('"', '"'), (' ', ' '), ('&', '&')) retVal = reduce(lambda x, y: x.replace(y[0], y[1]), codes, retVal) + retVal = re.sub(r"&#x([^;]+);", lambda match: chr(int(match.group(1), 16)), retVal) return retVal def singleTimeWarnMessage(message): # Cross-linked function diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py index cef689f21..3ddcf91c4 100644 --- a/lib/techniques/error/use.py +++ b/lib/techniques/error/use.py @@ -197,11 +197,6 @@ def _oneShotErrorUse(expression, field=None, chunkTest=False): _ = "%s(?P.*?)%s" % (kb.chars.start, kb.chars.stop) retVal = extractRegexResult(_, retVal, re.DOTALL | re.IGNORECASE) or retVal - try: - retVal = re.sub(r"&#x([^;]+);", lambda match: chr(int(match.group(1), 16)), retVal) - except ValueError: - pass - return safecharencode(retVal) if kb.safeCharEncode else retVal def _errorFields(expression, expressionFields, expressionFieldsList, num=None, emptyFields=None, suppressOutput=False):