Fixes #1639

stamparm · stamparm · commit e3650342bd81 · 2016-01-08T11:47:12.000+01:00
diff --git a/lib/core/convert.py b/lib/core/convert.py
@@ -8,6 +8,7 @@
 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 = (('&lt;', '<'), ('&gt;', '>'), ('&quot;', '"'), ('&nbsp;', ' '), ('&amp;', '&'))
         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
@@ -197,11 +197,6 @@ def _oneShotErrorUse(expression, field=None, chunkTest=False):
         _ = "%s(?P<result>.*?)%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):
