1 files changed, 19 insertions, 4 deletions
diff --git a/src/testlib/qabstracttestlogger.cpp b/src/testlib/qabstracttestlogger.cpp
index f7d8842c4c..d3a2678ecf 100644
--- a/src/testlib/qabstracttestlogger.cpp
+++ b/src/testlib/qabstracttestlogger.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -80,12 +80,29 @@ QAbstractTestLogger::~QAbstractTestLogger()
     stream = 0;
 }
 
+void QAbstractTestLogger::filterUnprintable(char *str) const
+{
+    char *idx = str;
+    while (*idx) {
+        if (((*idx < 0x20 && *idx != '\n' && *idx != '\t') || *idx > 0x7e))
+            *idx = '?';
+        ++idx;
+    }
+}
+
 void QAbstractTestLogger::outputString(const char *msg)
 {
     QTEST_ASSERT(stream);
+    QTEST_ASSERT(msg);
 
-    ::fputs(msg, stream);
+    char *filtered = new char[strlen(msg) + 1];
+    strcpy(filtered, msg);
+    filterUnprintable(filtered);
+
+    ::fputs(filtered, stream);
     ::fflush(stream);
+
+    delete [] filtered;
 }
 
 void QAbstractTestLogger::startLogging()
@@ -135,8 +152,6 @@ int qt_asprintf(QTestCharBuffer *str, const char *format, ...)
             break; // out of memory - take what we have
     }
 
-    filter_unprintable(str->data());
-
     return res;
 }