Refactor QTestCharBuffer a bit

Use a static buffer for small strings, and making it oom safe.
We can now see messages up to 512 bytes even if we run out of memory
(important for OOM tests). Also, testlogging (< 512 bytes per line)
should again work without a single allocation.

Reviewed-By: Rohan McGovern <rohan.mcgovern@nokia.com>

15 files changed, 257 insertions, 218 deletions

diff --git a/src/testlib/qabstracttestlogger.cpp b/src/testlib/qabstracttestlogger.cpp
index 6482ec9b86..2fa535ed13 100644
--- a/src/testlib/qabstracttestlogger.cpp
+++ b/src/testlib/qabstracttestlogger.cpp
@@ -43,8 +43,11 @@
 #include "QtTest/private/qtestlog_p.h"
 #include "QtTest/qtestassert.h"
 
+#include "QtCore/qbytearray.h"
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 
 #ifndef Q_OS_WIN
 #include <unistd.h>
@@ -106,4 +109,48 @@ void QAbstractTestLogger::stopLogging()
     QTest::stream = 0;
 }
 
+namespace QTest
+{
+
+extern void filter_unprintable(char *str);
+
+/*! \internal
+ */
+int qt_asprintf(QTestCharBuffer *str, const char *format, ...)
+{
+    static const int MAXSIZE = 1024*1024*2;
+
+    Q_ASSERT(str);
+
+    int size = str->size();
+
+    va_list ap;
+    int res = 0;
+
+    for (;;) {
+        va_start(ap, format);
+        res = qvsnprintf(str->data(), size, format, ap);
+        va_end(ap);
+        str->data()[size - 1] = '\0';
+        if (res >= 0 && res < size) {
+            // We succeeded
+            break;
+        }
+        // buffer wasn't big enough, try again.
+        // Note, we're assuming that a result of -1 is always due to running out of space.
+        size *= 2;
+        if (size > MAXSIZE) {
+            break;
+        }
+        if (!str->reset(size))
+            break; // out of memory - take what we have
+    }
+
+    filter_unprintable(str->data());
+
+    return res;
+}
+
+}
+
 QT_END_NAMESPACE
diff --git a/src/testlib/qabstracttestlogger_p.h b/src/testlib/qabstracttestlogger_p.h
index 588184e45d..183408669a 100644
--- a/src/testlib/qabstracttestlogger_p.h
+++ b/src/testlib/qabstracttestlogger_p.h
@@ -101,27 +101,26 @@ public:
 
 struct QTestCharBuffer
 {
-    inline QTestCharBuffer()
-            : buf(0)
-    {}
+    enum { InitialSize = 512 };
 
-    inline ~QTestCharBuffer()
+    inline QTestCharBuffer()
+            : _size(InitialSize), buf(staticBuf)
     {
-        delete[] buf;
-        buf = 0;
+        staticBuf[0] = '\0';
     }
 
-    inline operator void*()
+    inline ~QTestCharBuffer()
     {
-        return buf;
+        if (buf != staticBuf)
+            qFree(buf);
     }
 
-    inline operator char*()
+    inline char *data()
     {
         return buf;
     }
 
-    inline operator char**()
+    inline char **buffer()
     {
         return &buf;
     }
@@ -131,10 +130,43 @@ struct QTestCharBuffer
         return buf;
     }
 
+    inline int size() const
+    {
+        return _size;
+    }
+
+    inline bool reset(int newSize)
+    {
+        char *newBuf = 0;
+        if (buf == staticBuf) {
+            // if we point to our internal buffer, we need to malloc first
+            newBuf = reinterpret_cast<char *>(qMalloc(newSize));
+        } else {
+            // if we already malloc'ed, just realloc
+            newBuf = reinterpret_cast<char *>(qRealloc(buf, newSize));
+        }
+
+        // if the allocation went wrong (newBuf == 0), we leave the object as is
+        if (!newBuf)
+            return false;
+
+        _size = newSize;
+        buf = newBuf;
+        return true;
+    }
+
 private:
+    int _size;
     char* buf;
+    char staticBuf[InitialSize];
 };
 
+namespace QTest
+{
+    int qt_asprintf(QTestCharBuffer *buf, const char *format, ...);
+}
+
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index e075b36da5..2515c51ed9 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -180,7 +180,7 @@ namespace QTest {
                          : "";
         const char *filler = (tag[0] && gtag[0]) ? ":" : "";
         if (file) {
-            QTest::qt_asprintf(buf, "%s: %s::%s(%s%s%s)%s%s\n"
+            QTest::qt_asprintf(&buf, "%s: %s::%s(%s%s%s)%s%s\n"
 #ifdef Q_OS_WIN
                           "%s(%d) : failure location\n"
 #else
@@ -189,14 +189,14 @@ namespace QTest {
                           , type, QTestResult::currentTestObjectName(), fn, gtag, filler, tag,
                           msg[0] ? " " : "", msg, file, line);
         } else {
-            QTest::qt_asprintf(buf, "%s: %s::%s(%s%s%s)%s%s\n",
+            QTest::qt_asprintf(&buf, "%s: %s::%s(%s%s%s)%s%s\n",
                     type, QTestResult::currentTestObjectName(), fn, gtag, filler, tag,
                     msg[0] ? " " : "", msg);
         }
         // In colored mode, printf above stripped our nonprintable control characters.
         // Put them back.
-        memcpy(buf, type, strlen(type));
-        outputMessage(buf);
+        memcpy(buf.data(), type, strlen(type));
+        outputMessage(buf.data());
     }
 
     template <typename T>
@@ -207,7 +207,7 @@ namespace QTest {
 
         int digits = 0;
         qreal divisor = 1;
-        
+
         while (num / divisor >= 1) {
             divisor *= 10;
             ++digits;
diff --git a/src/testlib/qtest_global.h b/src/testlib/qtest_global.h
index c40f0adc38..b5b0fc0545 100644
--- a/src/testlib/qtest_global.h
+++ b/src/testlib/qtest_global.h
@@ -82,7 +82,6 @@ namespace QTest
     enum TestFailMode { Abort = 1, Continue = 2 };
 
     int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...);
-    int qt_asprintf(char **str, const char *format, ...);
 }
 
 QT_END_NAMESPACE
diff --git a/src/testlib/qtestbasicstreamer.cpp b/src/testlib/qtestbasicstreamer.cpp
index aac57bad8d..89de7d87b0 100644
--- a/src/testlib/qtestbasicstreamer.cpp
+++ b/src/testlib/qtestbasicstreamer.cpp
@@ -68,39 +68,39 @@ QTestBasicStreamer::QTestBasicStreamer()
 QTestBasicStreamer::~QTestBasicStreamer()
 {}
 
-void QTestBasicStreamer::formatStart(const QTestElement *element, char **formatted) const
+void QTestBasicStreamer::formatStart(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted )
         return;
-    QTest::qt_asprintf(formatted, "");
+    formatted->data()[0] = '\0';
 }
 
-void QTestBasicStreamer::formatEnd(const QTestElement *element, char **formatted) const
+void QTestBasicStreamer::formatEnd(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted )
         return;
-    QTest::qt_asprintf(formatted, "");
+    formatted->data()[0] = '\0';
 }
 
-void QTestBasicStreamer::formatBeforeAttributes(const QTestElement *element, char **formatted) const
+void QTestBasicStreamer::formatBeforeAttributes(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted )
         return;
-    QTest::qt_asprintf(formatted, "");
+    formatted->data()[0] = '\0';
 }
 
-void QTestBasicStreamer::formatAfterAttributes(const QTestElement *element, char **formatted) const
+void QTestBasicStreamer::formatAfterAttributes(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted )
         return;
-    QTest::qt_asprintf(formatted, "");
+    formatted->data()[0] = '\0';
 }
 
-void QTestBasicStreamer::formatAttributes(const QTestElement *, const QTestElementAttribute *attribute, char **formatted) const
+void QTestBasicStreamer::formatAttributes(const QTestElement *, const QTestElementAttribute *attribute, QTestCharBuffer *formatted) const
 {
     if(!attribute || !formatted )
         return;
-    QTest::qt_asprintf(formatted, "");
+    formatted->data()[0] = '\0';
 }
 
 void QTestBasicStreamer::output(QTestElement *element) const
@@ -125,22 +125,22 @@ void QTestBasicStreamer::outputElements(QTestElement *element, bool) const
     while (element) {
         hasChildren = element->childElements();
 
-        formatStart(element, buf);
-        outputString(buf);
+        formatStart(element, &buf);
+        outputString(buf.data());
 
-        formatBeforeAttributes(element, buf);
-        outputString(buf);
+        formatBeforeAttributes(element, &buf);
+        outputString(buf.data());
 
         outputElementAttributes(element, element->attributes());
 
-        formatAfterAttributes(element, buf);
-        outputString(buf);
+        formatAfterAttributes(element, &buf);
+        outputString(buf.data());
 
         if(hasChildren)
             outputElements(element->childElements(), true);
 
-        formatEnd(element, buf);
-        outputString(buf);
+        formatEnd(element, &buf);
+        outputString(buf.data());
 
         element = element->previousElement();
     }
@@ -150,8 +150,8 @@ void QTestBasicStreamer::outputElementAttributes(const QTestElement* element, QT
 {
     QTestCharBuffer buf;
     while(attribute){
-        formatAttributes(element, attribute, buf);
-        outputString(buf);
+        formatAttributes(element, attribute, &buf);
+        outputString(buf.data());
         attribute = attribute->nextElement();
     }
 }
diff --git a/src/testlib/qtestbasicstreamer.h b/src/testlib/qtestbasicstreamer.h
index 432dd223a8..cabbf34984 100644
--- a/src/testlib/qtestbasicstreamer.h
+++ b/src/testlib/qtestbasicstreamer.h
@@ -53,6 +53,7 @@ QT_MODULE(Test)
 class QTestElement;
 class QTestElementAttribute;
 class QTestLogger;
+class QTestCharBuffer;
 
 class QTestBasicStreamer
 {
@@ -71,11 +72,11 @@ class QTestBasicStreamer
         const QTestLogger *logger() const;
 
     protected:
-        virtual void formatStart(const QTestElement *element, char **formatted) const;
-        virtual void formatEnd(const QTestElement *element, char **formatted) const;
-        virtual void formatBeforeAttributes(const QTestElement *element, char **formatted) const;
-        virtual void formatAfterAttributes(const QTestElement *element, char **formatted) const;
-        virtual void formatAttributes(const QTestElement *element, const QTestElementAttribute *attribute, char **formatted) const;
+        virtual void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const;
+        virtual void formatEnd(const QTestElement *element, QTestCharBuffer *formatted) const;
+        virtual void formatBeforeAttributes(const QTestElement *element, QTestCharBuffer *formatted) const;
+        virtual void formatAfterAttributes(const QTestElement *element, QTestCharBuffer *formatted) const;
+        virtual void formatAttributes(const QTestElement *element, const QTestElementAttribute *attribute, QTestCharBuffer *formatted) const;
         virtual void outputElements(QTestElement *element, bool isChildElement = false) const;
         virtual void outputElementAttributes(const QTestElement *element, QTestElementAttribute *attribute) const;
 
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index ac4ca830c1..1866197d7f 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -820,43 +820,6 @@ void filter_unprintable(char *str)
 
 /*! \internal
  */
-int qt_asprintf(char **str, const char *format, ...)
-{
-    static const int MAXSIZE = 1024*1024*2;
-
-    int size = 32;
-    delete[] *str;
-    *str = new char[size];
-
-    va_list ap;
-    int res = 0;
-
-    for (;;) {
-        va_start(ap, format);
-        res = qvsnprintf(*str, size, format, ap);
-        va_end(ap);
-        (*str)[size - 1] = '\0';
-        if (res >= 0 && res < size) {
-            // We succeeded
-            break;
-        }
-        // buffer wasn't big enough, try again.
-        // Note, we're assuming that a result of -1 is always due to running out of space.
-        size *= 2;
-        if (size > MAXSIZE) {
-            break;
-        }
-        delete[] *str;
-        *str = new char[size];
-    }
-
-    filter_unprintable(*str);
-
-    return res;
-}
-
-/*! \internal
- */
 int qt_snprintf(char *str, int size, const char *format, ...)
 {
     va_list ap;
diff --git a/src/testlib/qtestlightxmlstreamer.cpp b/src/testlib/qtestlightxmlstreamer.cpp
index e176201242..b84f531ad7 100644
--- a/src/testlib/qtestlightxmlstreamer.cpp
+++ b/src/testlib/qtestlightxmlstreamer.cpp
@@ -59,7 +59,7 @@ QTestLightXmlStreamer::QTestLightXmlStreamer()
 QTestLightXmlStreamer::~QTestLightXmlStreamer()
 {}
 
-void QTestLightXmlStreamer::formatStart(const QTestElement *element, char **formatted) const
+void QTestLightXmlStreamer::formatStart(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted)
         return;
@@ -67,14 +67,14 @@ void QTestLightXmlStreamer::formatStart(const QTestElement *element, char **form
     switch(element->elementType()){
     case QTest::LET_TestCase: {
         QTestCharBuffer quotedTf;
-        QXmlTestLogger::xmlQuote(quotedTf, element->attributeValue(QTest::AI_Name));
+        QXmlTestLogger::xmlQuote(&quotedTf, element->attributeValue(QTest::AI_Name));
 
         QTest::qt_asprintf(formatted, "<TestFunction name=\"%s\">\n", quotedTf.constData());
         break;
     }
     case QTest::LET_Failure: {
         QTestCharBuffer cdataDesc;
-        QXmlTestLogger::xmlCdata(cdataDesc, element->attributeValue(QTest::AI_Description));
+        QXmlTestLogger::xmlCdata(&cdataDesc, element->attributeValue(QTest::AI_Description));
 
         QTest::qt_asprintf(formatted, "    <Description><![CDATA[%s]]></Description>\n",
                            cdataDesc.constData());
@@ -84,8 +84,8 @@ void QTestLightXmlStreamer::formatStart(const QTestElement *element, char **form
         // assuming type and attribute names don't need quoting
         QTestCharBuffer quotedFile;
         QTestCharBuffer cdataDesc;
-        QXmlTestLogger::xmlQuote(quotedFile, element->attributeValue(QTest::AI_File));
-        QXmlTestLogger::xmlCdata(cdataDesc, element->attributeValue(QTest::AI_Description));
+        QXmlTestLogger::xmlQuote(&quotedFile, element->attributeValue(QTest::AI_File));
+        QXmlTestLogger::xmlCdata(&cdataDesc, element->attributeValue(QTest::AI_Description));
 
         QTest::qt_asprintf(formatted, "<Message type=\"%s\" %s=\"%s\" %s=\"%s\">\n    <Description><![CDATA[%s]]></Description>\n</Message>\n",
                            element->attributeValue(QTest::AI_Type),
@@ -100,8 +100,8 @@ void QTestLightXmlStreamer::formatStart(const QTestElement *element, char **form
         // assuming value and iterations don't need quoting
         QTestCharBuffer quotedMetric;
         QTestCharBuffer quotedTag;
-        QXmlTestLogger::xmlQuote(quotedMetric, element->attributeValue(QTest::AI_Metric));
-        QXmlTestLogger::xmlQuote(quotedTag, element->attributeValue(QTest::AI_Tag));
+        QXmlTestLogger::xmlQuote(&quotedMetric, element->attributeValue(QTest::AI_Metric));
+        QXmlTestLogger::xmlQuote(&quotedTag, element->attributeValue(QTest::AI_Tag));
 
         QTest::qt_asprintf(formatted, "<BenchmarkResult %s=\"%s\" %s=\"%s\" %s=\"%s\" %s=\"%s\" />\n",
                            element->attributeName(QTest::AI_Metric),
@@ -115,11 +115,11 @@ void QTestLightXmlStreamer::formatStart(const QTestElement *element, char **form
         break;
     }
     default:
-        QTest::qt_asprintf(formatted, "");
+        formatted->data()[0] = '\0';
     }
 }
 
-void QTestLightXmlStreamer::formatEnd(const QTestElement *element, char **formatted) const
+void QTestLightXmlStreamer::formatEnd(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted)
         return;
@@ -129,47 +129,47 @@ void QTestLightXmlStreamer::formatEnd(const QTestElement *element, char **format
             QTest::qt_asprintf(formatted, "</Incident>\n</TestFunction>\n");
         else
             QTest::qt_asprintf(formatted, "</TestFunction>\n");
+    } else {
+        formatted->data()[0] = '\0';
     }
-    else
-        QTest::qt_asprintf(formatted, "");
 }
 
-void QTestLightXmlStreamer::formatBeforeAttributes(const QTestElement *element, char **formatted) const
+void QTestLightXmlStreamer::formatBeforeAttributes(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted)
         return;
 
-    if (element->elementType() == QTest::LET_TestCase && element->attribute(QTest::AI_Result)){
-    QTestCharBuffer buf;
-    QTestCharBuffer quotedFile;
-    QXmlTestLogger::xmlQuote(quotedFile, element->attributeValue(QTest::AI_File));
-
-    QTest::qt_asprintf(buf, "%s=\"%s\" %s=\"%s\"",
-                       element->attributeName(QTest::AI_File),
-                       quotedFile.constData(),
-                       element->attributeName(QTest::AI_Line),
-                       element->attributeValue(QTest::AI_Line));
-
-    if( !element->childElements() )
-        QTest::qt_asprintf(formatted, "<Incident type=\"%s\" %s/>\n",
-                           element->attributeValue(QTest::AI_Result), buf.constData());
-    else
-        QTest::qt_asprintf(formatted, "<Incident type=\"%s\" %s>\n",
-                               element->attributeValue(QTest::AI_Result), buf.constData());
-    }else{
-        QTest::qt_asprintf(formatted, "");
+    if (element->elementType() == QTest::LET_TestCase && element->attribute(QTest::AI_Result)) {
+        QTestCharBuffer buf;
+        QTestCharBuffer quotedFile;
+        QXmlTestLogger::xmlQuote(&quotedFile, element->attributeValue(QTest::AI_File));
+
+        QTest::qt_asprintf(&buf, "%s=\"%s\" %s=\"%s\"",
+                element->attributeName(QTest::AI_File),
+                quotedFile.constData(),
+                element->attributeName(QTest::AI_Line),
+                element->attributeValue(QTest::AI_Line));
+
+        if( !element->childElements() )
+            QTest::qt_asprintf(formatted, "<Incident type=\"%s\" %s/>\n",
+                    element->attributeValue(QTest::AI_Result), buf.constData());
+        else
+            QTest::qt_asprintf(formatted, "<Incident type=\"%s\" %s>\n",
+                    element->attributeValue(QTest::AI_Result), buf.constData());
+    } else {
+        formatted->data()[0] = '\0';
     }
 }
 
 void QTestLightXmlStreamer::output(QTestElement *element) const
 {
     QTestCharBuffer buf;
-    QTest::qt_asprintf(buf, "<Environment>\n    <QtVersion>%s</QtVersion>\n    <QTestVersion>%s</QTestVersion>\n",
+    QTest::qt_asprintf(&buf, "<Environment>\n    <QtVersion>%s</QtVersion>\n    <QTestVersion>%s</QTestVersion>\n",
                        qVersion(), QTEST_VERSION_STR );
-    outputString(buf);
+    outputString(buf.constData());
 
-    QTest::qt_asprintf(buf, "</Environment>\n");
-    outputString(buf);
+    QTest::qt_asprintf(&buf, "</Environment>\n");
+    outputString(buf.constData());
 
     QTestBasicStreamer::output(element);
 }
diff --git a/src/testlib/qtestlightxmlstreamer.h b/src/testlib/qtestlightxmlstreamer.h
index 6dafdcc0f2..e147e5cc09 100644
--- a/src/testlib/qtestlightxmlstreamer.h
+++ b/src/testlib/qtestlightxmlstreamer.h
@@ -59,9 +59,9 @@ class QTestLightXmlStreamer: public QTestBasicStreamer
         QTestLightXmlStreamer();
         ~QTestLightXmlStreamer();
 
-        void formatStart(const QTestElement *element, char **formatted) const;
-        void formatEnd(const QTestElement *element, char **formatted) const;
-        void formatBeforeAttributes(const QTestElement *element, char **formatted) const;
+        void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const;
+        void formatEnd(const QTestElement *element, QTestCharBuffer *formatted) const;
+        void formatBeforeAttributes(const QTestElement *element, QTestCharBuffer *formatted) const;
         void output(QTestElement *element) const;
 };
 
diff --git a/src/testlib/qtestxmlstreamer.cpp b/src/testlib/qtestxmlstreamer.cpp
index 1b6e674e8f..c72d6480f5 100644
--- a/src/testlib/qtestxmlstreamer.cpp
+++ b/src/testlib/qtestxmlstreamer.cpp
@@ -60,7 +60,7 @@ QTestXmlStreamer::QTestXmlStreamer()
 QTestXmlStreamer::~QTestXmlStreamer()
 {}
 
-void QTestXmlStreamer::formatStart(const QTestElement *element, char **formatted) const
+void QTestXmlStreamer::formatStart(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted)
         return;
@@ -68,20 +68,20 @@ void QTestXmlStreamer::formatStart(const QTestElement *element, char **formatted
     switch(element->elementType()){
     case QTest::LET_TestCase: {
         QTestCharBuffer quotedTf;
-        QXmlTestLogger::xmlQuote(quotedTf, element->attributeValue(QTest::AI_Name));
+        QXmlTestLogger::xmlQuote(&quotedTf, element->attributeValue(QTest::AI_Name));
 
         QTest::qt_asprintf(formatted, "<TestFunction name=\"%s\">\n", quotedTf.constData());
         break;
     }
     case QTest::LET_Failure: {
         QTestCharBuffer cdataDesc;
-        QXmlTestLogger::xmlCdata(cdataDesc, element->attributeValue(QTest::AI_Description));
+        QXmlTestLogger::xmlCdata(&cdataDesc, element->attributeValue(QTest::AI_Description));
 
         QTestCharBuffer location;
         QTestCharBuffer quotedFile;
-        QXmlTestLogger::xmlQuote(quotedFile, element->attributeValue(QTest::AI_File));
+        QXmlTestLogger::xmlQuote(&quotedFile, element->attributeValue(QTest::AI_File));
 
-        QTest::qt_asprintf(location, "%s=\"%s\" %s=\"%s\"",
+        QTest::qt_asprintf(&location, "%s=\"%s\" %s=\"%s\"",
                            element->attributeName(QTest::AI_File),
                            quotedFile.constData(),
                            element->attributeName(QTest::AI_Line),
@@ -89,7 +89,7 @@ void QTestXmlStreamer::formatStart(const QTestElement *element, char **formatted
 
         if (element->attribute(QTest::AI_Tag)) {
             QTestCharBuffer cdataTag;
-            QXmlTestLogger::xmlCdata(cdataTag, element->attributeValue(QTest::AI_Tag));
+            QXmlTestLogger::xmlCdata(&cdataTag, element->attributeValue(QTest::AI_Tag));
             QTest::qt_asprintf(formatted, "<Incident type=\"%s\" %s>\n"
                 "    <DataTag><![CDATA[%s]]></DataTag>\n"
                 "    <Description><![CDATA[%s]]></Description>\n"
@@ -108,8 +108,8 @@ void QTestXmlStreamer::formatStart(const QTestElement *element, char **formatted
         // assuming type and attribute names don't need quoting
         QTestCharBuffer quotedFile;
         QTestCharBuffer cdataDesc;
-        QXmlTestLogger::xmlQuote(quotedFile, element->attributeValue(QTest::AI_File));
-        QXmlTestLogger::xmlCdata(cdataDesc, element->attributeValue(QTest::AI_Description));
+        QXmlTestLogger::xmlQuote(&quotedFile, element->attributeValue(QTest::AI_File));
+        QXmlTestLogger::xmlCdata(&cdataDesc, element->attributeValue(QTest::AI_Description));
 
         QTest::qt_asprintf(formatted, "<Message type=\"%s\" %s=\"%s\" %s=\"%s\">\n    <Description><![CDATA[%s]]></Description>\n</Message>\n",
                            element->attributeValue(QTest::AI_Type),
@@ -124,8 +124,8 @@ void QTestXmlStreamer::formatStart(const QTestElement *element, char **formatted
         // assuming value and iterations don't need quoting
         QTestCharBuffer quotedMetric;
         QTestCharBuffer quotedTag;
-        QXmlTestLogger::xmlQuote(quotedMetric, element->attributeValue(QTest::AI_Metric));
-        QXmlTestLogger::xmlQuote(quotedTag, element->attributeValue(QTest::AI_Tag));
+        QXmlTestLogger::xmlQuote(&quotedMetric, element->attributeValue(QTest::AI_Metric));
+        QXmlTestLogger::xmlQuote(&quotedTag, element->attributeValue(QTest::AI_Tag));
 
         QTest::qt_asprintf(formatted, "<BenchmarkResult %s=\"%s\" %s=\"%s\" %s=\"%s\" %s=\"%s\" />\n",
                            element->attributeName(QTest::AI_Metric),
@@ -139,23 +139,23 @@ void QTestXmlStreamer::formatStart(const QTestElement *element, char **formatted
         break;
     }
     default:
-        QTest::qt_asprintf(formatted, "");
+        formatted->data()[0] = '\0';
     }
 }
 
-void QTestXmlStreamer::formatEnd(const QTestElement *element, char **formatted) const
+void QTestXmlStreamer::formatEnd(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted)
         return;
 
     if (element->elementType() == QTest::LET_TestCase) {
         QTest::qt_asprintf(formatted, "</TestFunction>\n");
+    } else {
+        formatted->data()[0] = '\0';
     }
-    else
-        QTest::qt_asprintf(formatted, "");
 }
 
-void QTestXmlStreamer::formatBeforeAttributes(const QTestElement *element, char **formatted) const
+void QTestXmlStreamer::formatBeforeAttributes(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted)
         return;
@@ -163,9 +163,9 @@ void QTestXmlStreamer::formatBeforeAttributes(const QTestElement *element, char
     if (element->elementType() == QTest::LET_TestCase && element->attribute(QTest::AI_Result)){
         QTestCharBuffer buf;
         QTestCharBuffer quotedFile;
-        QXmlTestLogger::xmlQuote(quotedFile, element->attributeValue(QTest::AI_File));
+        QXmlTestLogger::xmlQuote(&quotedFile, element->attributeValue(QTest::AI_File));
 
-        QTest::qt_asprintf(buf, "%s=\"%s\" %s=\"%s\"",
+        QTest::qt_asprintf(&buf, "%s=\"%s\" %s=\"%s\"",
                            element->attributeName(QTest::AI_File),
                            quotedFile.constData(),
                            element->attributeName(QTest::AI_Line),
@@ -174,12 +174,11 @@ void QTestXmlStreamer::formatBeforeAttributes(const QTestElement *element, char
         if( !element->childElements() ) {
             QTest::qt_asprintf(formatted, "<Incident type=\"%s\" %s/>\n",
                                element->attributeValue(QTest::AI_Result), buf.constData());
+        } else {
+            formatted->data()[0] = '\0';
         }
-        else {
-            QTest::qt_asprintf(formatted, "");
-        }
-    }else{
-        QTest::qt_asprintf(formatted, "");
+    } else {
+        formatted->data()[0] = '\0';
     }
 }
 
@@ -187,23 +186,23 @@ void QTestXmlStreamer::output(QTestElement *element) const
 {
     QTestCharBuffer buf;
     QTestCharBuffer quotedTc;
-    QXmlTestLogger::xmlQuote(quotedTc, QTestResult::currentTestObjectName());
+    QXmlTestLogger::xmlQuote(&quotedTc, QTestResult::currentTestObjectName());
 
-    QTest::qt_asprintf(buf, "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<TestCase name=\"%s\">\n",
+    QTest::qt_asprintf(&buf, "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<TestCase name=\"%s\">\n",
                        quotedTc.constData());
-    outputString(buf);
+    outputString(buf.constData());
 
-    QTest::qt_asprintf(buf, "<Environment>\n    <QtVersion>%s</QtVersion>\n    <QTestVersion>%s</QTestVersion>\n",
+    QTest::qt_asprintf(&buf, "<Environment>\n    <QtVersion>%s</QtVersion>\n    <QTestVersion>%s</QTestVersion>\n",
                        qVersion(), QTEST_VERSION_STR );
-    outputString(buf);
+    outputString(buf.constData());
 
-    QTest::qt_asprintf(buf, "</Environment>\n");
-    outputString(buf);
+    QTest::qt_asprintf(&buf, "</Environment>\n");
+    outputString(buf.constData());
 
     QTestBasicStreamer::output(element);
 
-    QTest::qt_asprintf(buf, "</TestCase>\n");
-    outputString(buf);
+    QTest::qt_asprintf(&buf, "</TestCase>\n");
+    outputString(buf.constData());
 }
 
 QT_END_NAMESPACE
diff --git a/src/testlib/qtestxmlstreamer.h b/src/testlib/qtestxmlstreamer.h
index a601f6034a..6e1ae84cbd 100644
--- a/src/testlib/qtestxmlstreamer.h
+++ b/src/testlib/qtestxmlstreamer.h
@@ -59,9 +59,9 @@ class QTestXmlStreamer: public QTestBasicStreamer
         QTestXmlStreamer();
         ~QTestXmlStreamer();
 
-        void formatStart(const QTestElement *element, char **formatted) const;
-        void formatEnd(const QTestElement *element, char **formatted) const;
-        void formatBeforeAttributes(const QTestElement *element, char **formatted) const;
+        void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const;
+        void formatEnd(const QTestElement *element, QTestCharBuffer *formatted) const;
+        void formatBeforeAttributes(const QTestElement *element, QTestCharBuffer *formatted) const;
         void output(QTestElement *element) const;
 };
 
diff --git a/src/testlib/qtestxunitstreamer.cpp b/src/testlib/qtestxunitstreamer.cpp
index d5d2631bf1..932b70b130 100644
--- a/src/testlib/qtestxunitstreamer.cpp
+++ b/src/testlib/qtestxunitstreamer.cpp
@@ -73,7 +73,7 @@ void QTestXunitStreamer::indentForElement(const QTestElement* element, char* buf
     }
 }
 
-void QTestXunitStreamer::formatStart(const QTestElement *element, char **formatted) const
+void QTestXunitStreamer::formatStart(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted )
         return;
@@ -85,8 +85,7 @@ void QTestXunitStreamer::formatStart(const QTestElement *element, char **formatt
     if (element->elementType() == QTest::LET_Error) {
         if (element->parentElement()->elementType() == QTest::LET_SystemError) {
             QTest::qt_asprintf(formatted, "<![CDATA[");
-        }
-        else {
+        } else {
             QTest::qt_asprintf(formatted, "%s<!--", indent);
         }
         return;
@@ -95,13 +94,13 @@ void QTestXunitStreamer::formatStart(const QTestElement *element, char **formatt
     QTest::qt_asprintf(formatted, "%s<%s", indent, element->elementName());
 }
 
-void QTestXunitStreamer::formatEnd(const QTestElement *element, char **formatted) const
+void QTestXunitStreamer::formatEnd(const QTestElement *element, QTestCharBuffer *formatted) const
 {
-    if(!element || !formatted )
+    if (!element || !formatted )
         return;
 
-    if(!element->childElements()){
-        QTest::qt_asprintf(formatted, "");
+    if (!element->childElements()){
+        formatted->data()[0] = '\0';
         return;
     }
 
@@ -111,7 +110,7 @@ void QTestXunitStreamer::formatEnd(const QTestElement *element, char **formatted
     QTest::qt_asprintf(formatted, "%s</%s>\n", indent, element->elementName());
 }
 
-void QTestXunitStreamer::formatAttributes(const QTestElement* element, const QTestElementAttribute *attribute, char **formatted) const
+void QTestXunitStreamer::formatAttributes(const QTestElement* element, const QTestElementAttribute *attribute, QTestCharBuffer *formatted) const
 {
     if(!attribute || !formatted )
         return;
@@ -136,15 +135,14 @@ void QTestXunitStreamer::formatAttributes(const QTestElement* element, const QTe
 
     if (key) {
         QTestCharBuffer quotedValue;
-        QXmlTestLogger::xmlQuote(quotedValue, attribute->value());
+        QXmlTestLogger::xmlQuote(&quotedValue, attribute->value());
         QTest::qt_asprintf(formatted, " %s=\"%s\"", key, quotedValue.constData());
-    }
-    else {
-        QTest::qt_asprintf(formatted, "");
+    } else {
+        formatted->data()[0] = '\0';
     }
 }
 
-void QTestXunitStreamer::formatAfterAttributes(const QTestElement *element, char **formatted) const
+void QTestXunitStreamer::formatAfterAttributes(const QTestElement *element, QTestCharBuffer *formatted) const
 {
     if(!element || !formatted )
         return;
@@ -153,8 +151,7 @@ void QTestXunitStreamer::formatAfterAttributes(const QTestElement *element, char
     if (element->elementType() == QTest::LET_Error) {
         if (element->parentElement()->elementType() == QTest::LET_SystemError) {
             QTest::qt_asprintf(formatted, "]]>\n");
-        }
-        else {
+        } else {
             QTest::qt_asprintf(formatted, " -->\n");
         }
         return;
@@ -187,22 +184,22 @@ void QTestXunitStreamer::outputElements(QTestElement *element, bool) const
         hasChildren = element->childElements();
 
         if(element->elementType() != QTest::LET_Benchmark){
-            formatStart(element, buf);
-            outputString(buf);
+            formatStart(element, &buf);
+            outputString(buf.data());
 
-            formatBeforeAttributes(element, buf);
-            outputString(buf);
+            formatBeforeAttributes(element, &buf);
+            outputString(buf.data());
 
             outputElementAttributes(element, element->attributes());
 
-            formatAfterAttributes(element, buf);
-            outputString(buf);
+            formatAfterAttributes(element, &buf);
+            outputString(buf.data());
 
             if(hasChildren)
                 outputElements(element->childElements(), true);
 
-            formatEnd(element, buf);
-            outputString(buf);
+            formatEnd(element, &buf);
+            outputString(buf.data());
         }
         element = element->previousElement();
     }
diff --git a/src/testlib/qtestxunitstreamer.h b/src/testlib/qtestxunitstreamer.h
index 044307f9ee..43ff03d814 100644
--- a/src/testlib/qtestxunitstreamer.h
+++ b/src/testlib/qtestxunitstreamer.h
@@ -58,10 +58,10 @@ class QTestXunitStreamer: public QTestBasicStreamer
         QTestXunitStreamer();
         ~QTestXunitStreamer();
 
-        void formatStart(const QTestElement *element, char **formatted) const;
-        void formatEnd(const QTestElement *element, char **formatted) const;
-        void formatAfterAttributes(const QTestElement *element, char **formatted) const;
-        void formatAttributes(const QTestElement *element, const QTestElementAttribute *attribute, char **formatted) const;
+        void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const;
+        void formatEnd(const QTestElement *element, QTestCharBuffer *formatted) const;
+        void formatAfterAttributes(const QTestElement *element, QTestCharBuffer *formatted) const;
+        void formatAttributes(const QTestElement *element, const QTestElementAttribute *attribute, QTestCharBuffer *formatted) const;
         void output(QTestElement *element) const;
         void outputElements(QTestElement *element, bool isChildElement = false) const;
 
diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp
index fca7bfc1e6..494acb46f1 100644
--- a/src/testlib/qxmltestlogger.cpp
+++ b/src/testlib/qxmltestlogger.cpp
@@ -108,19 +108,19 @@ void QXmlTestLogger::startLogging()
 
     if (xmlmode == QXmlTestLogger::Complete) {
         QTestCharBuffer quotedTc;
-        xmlQuote(quotedTc, QTestResult::currentTestObjectName());
-        QTest::qt_asprintf(buf,
+        xmlQuote(&quotedTc, QTestResult::currentTestObjectName());
+        QTest::qt_asprintf(&buf,
                 "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n"
                 "<TestCase name=\"%s\">\n", quotedTc.constData());
-        outputString(buf);
+        outputString(buf.constData());
     }
 
-    QTest::qt_asprintf(buf,
+    QTest::qt_asprintf(&buf,
             "<Environment>\n"
             "    <QtVersion>%s</QtVersion>\n"
             "    <QTestVersion>"QTEST_VERSION_STR"</QTestVersion>\n"
             "</Environment>\n", qVersion());
-    outputString(buf);
+    outputString(buf.constData());
 }
 
 void QXmlTestLogger::stopLogging()
@@ -136,9 +136,9 @@ void QXmlTestLogger::enterTestFunction(const char *function)
 {
     QTestCharBuffer buf;
     QTestCharBuffer quotedFunction;
-    xmlQuote(quotedFunction, function);
-    QTest::qt_asprintf(buf, "<TestFunction name=\"%s\">\n", quotedFunction.constData());
-    outputString(buf);
+    xmlQuote(&quotedFunction, function);
+    QTest::qt_asprintf(&buf, "<TestFunction name=\"%s\">\n", quotedFunction.constData());
+    outputString(buf.constData());
 }
 
 void QXmlTestLogger::leaveTestFunction()
@@ -219,12 +219,12 @@ void QXmlTestLogger::addIncident(IncidentTypes type, const char *description,
     QTestCharBuffer cdataTag;
     QTestCharBuffer cdataDescription;
 
-    xmlQuote(quotedFile, file);
-    xmlCdata(cdataGtag, gtag);
-    xmlCdata(cdataTag, tag);
-    xmlCdata(cdataDescription, description);
+    xmlQuote(&quotedFile, file);
+    xmlCdata(&cdataGtag, gtag);
+    xmlCdata(&cdataTag, tag);
+    xmlCdata(&cdataDescription, description);
 
-    QTest::qt_asprintf(buf,
+    QTest::qt_asprintf(&buf,
             QTest::incidentFormatString(QTest::isEmpty(description), notag),
             QTest::xmlIncidentType2String(type),
             quotedFile.constData(), line,
@@ -233,7 +233,7 @@ void QXmlTestLogger::addIncident(IncidentTypes type, const char *description,
             cdataTag.constData(),
             cdataDescription.constData());
 
-    outputString(buf);
+    outputString(buf.constData());
 }
 
 void QXmlTestLogger::addBenchmarkResult(const QBenchmarkResult &result)
@@ -242,18 +242,18 @@ void QXmlTestLogger::addBenchmarkResult(const QBenchmarkResult &result)
     QTestCharBuffer quotedMetric;
     QTestCharBuffer quotedTag;
 
-    xmlQuote(quotedMetric,
+    xmlQuote(&quotedMetric,
         QBenchmarkGlobalData::current->measurer->metricText().toAscii().constData());
-    xmlQuote(quotedTag, result.context.tag.toAscii().constData());
+    xmlQuote(&quotedTag, result.context.tag.toAscii().constData());
 
     QTest::qt_asprintf(
-        buf,
+        &buf,
         QTest::benchmarkResultFormatString(),
         quotedMetric.constData(),
         quotedTag.constData(),
         QByteArray::number(result.value).constData(),  //no 64-bit qt_snprintf support
         result.iterations);
-    outputString(buf);
+    outputString(buf.constData());
 }
 
 void QXmlTestLogger::addMessage(MessageTypes type, const char *message,
@@ -270,12 +270,12 @@ void QXmlTestLogger::addMessage(MessageTypes type, const char *message,
     QTestCharBuffer cdataTag;
     QTestCharBuffer cdataDescription;
 
-    xmlQuote(quotedFile, file);
-    xmlCdata(cdataGtag, gtag);
-    xmlCdata(cdataTag, tag);
-    xmlCdata(cdataDescription, message);
+    xmlQuote(&quotedFile, file);
+    xmlCdata(&cdataGtag, gtag);
+    xmlCdata(&cdataTag, tag);
+    xmlCdata(&cdataDescription, message);
 
-    QTest::qt_asprintf(buf,
+    QTest::qt_asprintf(&buf,
             QTest::messageFormatString(QTest::isEmpty(message), notag),
             QTest::xmlMessageType2String(type),
             quotedFile.constData(), line,
@@ -284,7 +284,7 @@ void QXmlTestLogger::addMessage(MessageTypes type, const char *message,
             cdataTag.constData(),
             cdataDescription.constData());
 
-    outputString(buf);
+    outputString(buf.constData());
 }
 
 /*
@@ -292,10 +292,11 @@ void QXmlTestLogger::addMessage(MessageTypes type, const char *message,
     XML characters as necessary so that dest is suitable for use in an XML
     quoted attribute string.
 */
-int QXmlTestLogger::xmlQuote(char* dest, char const* src, size_t n)
+int QXmlTestLogger::xmlQuote(QTestCharBuffer* destBuf, char const* src, size_t n)
 {
     if (n == 0) return 0;
 
+    char *dest = destBuf->data();
     *dest = 0;
     if (!src) return 0;
 
@@ -351,10 +352,12 @@ int QXmlTestLogger::xmlQuote(char* dest, char const* src, size_t n)
     Copy up to n characters from the src string into dest, escaping any
     special strings such that dest is suitable for use in an XML CDATA section.
 */
-int QXmlTestLogger::xmlCdata(char* dest, char const* src, size_t n)
+int QXmlTestLogger::xmlCdata(QTestCharBuffer *destBuf, char const* src, size_t n)
 {
     if (!n) return 0;
 
+    char *dest = destBuf->data();
+
     if (!src || n == 1) {
         *dest = 0;
         return 0;
@@ -394,25 +397,23 @@ int QXmlTestLogger::xmlCdata(char* dest, char const* src, size_t n)
     return (dest-begin);
 }
 
-typedef int (*StringFormatFunction)(char*,char const*,size_t);
+typedef int (*StringFormatFunction)(QTestCharBuffer*,char const*,size_t);
 
 /*
     A wrapper for string functions written to work with a fixed size buffer so they can be called
     with a dynamically allocated buffer.
 */
-int allocateStringFn(char** str, char const* src, StringFormatFunction func)
+int allocateStringFn(QTestCharBuffer* str, char const* src, StringFormatFunction func)
 {
     static const int MAXSIZE = 1024*1024*2;
 
-    int size = 32;
-    delete[] *str;
-    *str = new char[size];
+    int size = str->size();
 
     int res = 0;
 
     for (;;) {
-        res = func(*str, src, size);
-        (*str)[size - 1] = '\0';
+        res = func(str, src, size);
+        str->data()[size - 1] = '\0';
         if (res < size) {
             // We succeeded or fatally failed
             break;
@@ -422,19 +423,19 @@ int allocateStringFn(char** str, char const* src, StringFormatFunction func)
         if (size > MAXSIZE) {
             break;
         }
-        delete[] *str;
-        *str = new char[size];
+        if (!str->reset(size))
+            break; // ran out of memory - bye
     }
 
     return res;
 }
 
-int QXmlTestLogger::xmlQuote(char** str, char const* src)
+int QXmlTestLogger::xmlQuote(QTestCharBuffer* str, char const* src)
 {
     return allocateStringFn(str, src, QXmlTestLogger::xmlQuote);
 }
 
-int QXmlTestLogger::xmlCdata(char** str, char const* src)
+int QXmlTestLogger::xmlCdata(QTestCharBuffer* str, char const* src)
 {
     return allocateStringFn(str, src, QXmlTestLogger::xmlCdata);
 }
diff --git a/src/testlib/qxmltestlogger_p.h b/src/testlib/qxmltestlogger_p.h
index a7cc00a34c..e14504ce44 100644
--- a/src/testlib/qxmltestlogger_p.h
+++ b/src/testlib/qxmltestlogger_p.h
@@ -79,10 +79,10 @@ public:
     void addMessage(MessageTypes type, const char *message,
                     const char *file = 0, int line = 0);
 
-    static int xmlCdata(char** dest, char const* src);
-    static int xmlQuote(char** dest, char const* src);
-    static int xmlCdata(char* dest, char const* src, size_t n);
-    static int xmlQuote(char* dest, char const* src, size_t n);
+    static int xmlCdata(QTestCharBuffer *dest, char const* src);
+    static int xmlQuote(QTestCharBuffer *dest, char const* src);
+    static int xmlCdata(QTestCharBuffer *dest, char const* src, size_t n);
+    static int xmlQuote(QTestCharBuffer *dest, char const* src, size_t n);
 
 private:
     XmlMode xmlmode;