From e522263640efe497021e97c94ab2f21a49f82491 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Fri, 29 Jul 2011 10:45:09 +0000
Subject: [PATCH] fix for a neverending data retrieval in large full inband
 cases

---
 lib/core/common.py          | 3 +++
 lib/techniques/union/use.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index 7422c6f37..dfed6eca6 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -51,6 +51,7 @@ from lib.core.data import logger
 from lib.core.data import paths
 from lib.core.data import queries
 from lib.core.convert import htmlunescape
+from lib.core.convert import safecharencode
 from lib.core.convert import urldecode
 from lib.core.convert import urlencode
 from lib.core.enums import DBMS
@@ -1361,6 +1362,8 @@ def parseUnionPage(output, expression, partial=False, condition=None, sort=True)
             output = dict_.values()
 
         for entry in output:
+            entry = safecharencode(entry) if kb.safeCharEncode else entry
+
             info = []
 
             if DUMP_DEL_MARKER in entry:
diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py
index e924c7615..c28dc14fb 100644
--- a/lib/techniques/union/use.py
+++ b/lib/techniques/union/use.py
@@ -97,7 +97,7 @@ def __oneShotUnionUse(expression, unpack=True):
             warnMsg += "issues)"
             singleTimeWarnMessage(warnMsg)
 
-    return safecharencode(output) if kb.safeCharEncode else output
+    return output
 
 def configUnion(char=None, columns=None):
     def __configUnionChar(char):