From c193b896be3e1390972f39ac172e143959bedde8 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 12 Apr 2011 23:07:50 +0000
Subject: [PATCH] just in case update to prevent gibberish "retrieved: "
 outputs

---
 lib/core/common.py          | 4 ++--
 lib/core/settings.py        | 2 +-
 lib/techniques/error/use.py | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index 4d6108788..ed42b30d3 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -72,7 +72,7 @@ from lib.core.settings import REVISION
 from lib.core.settings import VERSION_STRING
 from lib.core.settings import SITE
 from lib.core.settings import ERROR_PARSING_REGEXES
-from lib.core.settings import NON_CONTROL_CHAR_REGEX
+from lib.core.settings import NON_PRINTABLE_CHAR_REGEX
 from lib.core.settings import SQL_STATEMENTS
 from lib.core.settings import SUPPORTED_DBMS
 from lib.core.settings import UNKNOWN_DBMS_VERSION
@@ -2121,7 +2121,7 @@ def filterControlChars(value):
     Returns string value with control chars being supstituted with ' '
     """
 
-    return filterStringValue(value, NON_CONTROL_CHAR_REGEX, ' ')
+    return filterStringValue(value, NON_PRINTABLE_CHAR_REGEX, ' ')
 
 def isDBMSVersionAtLeast(version):
     """
diff --git a/lib/core/settings.py b/lib/core/settings.py
index 7d4018346..4a9deb4cb 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -57,7 +57,7 @@ URI_QUESTION_MARKER = "__QUESTION_MARK__"
 
 PAYLOAD_DELIMITER   = "\x00"
 CHAR_INFERENCE_MARK = "%c"
-NON_CONTROL_CHAR_REGEX = r'[^\x00-\x1f]'
+NON_PRINTABLE_CHAR_REGEX = r'[^\x00-\x1f\x7f-\xff]'
 
 # dumping characters used in GROUP_CONCAT MySQL technique
 CONCAT_ROW_DELIMITER     = ','
diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py
index 141c3de3e..feaa38c16 100644
--- a/lib/techniques/error/use.py
+++ b/lib/techniques/error/use.py
@@ -24,6 +24,7 @@ from lib.core.common import randomInt
 from lib.core.common import replaceNewlineTabs
 from lib.core.common import safeStringFormat
 from lib.core.convert import htmlunescape
+from lib.core.convert import safehexencode
 from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
@@ -135,7 +136,7 @@ def __errorFields(expression, expressionFields, expressionFieldsList, expected=N
             output = __oneShotErrorUse(expressionReplaced, field)
 
             if output is not None:
-                dataToStdout("[%s] [INFO] retrieved: %s\n" % (time.strftime("%X"), replaceNewlineTabs(output, stdout=True)))
+                dataToStdout("[%s] [INFO] retrieved: %s\n" % (time.strftime("%X"), safehexencode(replaceNewlineTabs(output, stdout=True))))
 
         if isinstance(num, int):
             expression = origExpr