fix for a crash with partial union and --hex

stamparm · stamparm · commit 61ad3b999aa9 · 2012-03-14T10:31:24.000Z
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -1245,7 +1245,6 @@ def parseUnionPage(output, unique=True):
 
         for entry in output:
             entry = entry.group(1)
-            entry = decodeHexValue(entry) if conf.hexConvert else entry
 
             if unique:
                 key = entry.lower()
@@ -1256,9 +1255,14 @@ def parseUnionPage(output, unique=True):
                 else:
                     continue
 
-            entry = safecharencode(entry) if kb.safeCharEncode else entry
             entry = entry.split(kb.chars.delimiter)
 
+            if conf.hexConvert:
+                entry = applyFunctionRecursively(entry, decodeHexValue)
+
+            if kb.safeCharEncode:
+                entry = applyFunctionRecursively(entry, safecharencode)
+
             data.append(entry[0] if len(entry) == 1 else entry)
     else:
         data = output
diff --git a/lib/takeover/web.py b/lib/takeover/web.py
@@ -136,7 +136,7 @@ def webInit(self):
         logger.info(infoMsg)
 
         default = None
-        choices = ['asp', 'aspx', 'php', 'jsp']
+        choices = ('asp', 'aspx', 'php', 'jsp')
 
         for ext in choices:
             if conf.url.endswith(ext):
