From 53a16752c257d2f4f99ecef2cde1580b817fc12a Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Mon, 27 Jun 2011 13:09:23 +0200
Subject: QStringBuilder: do not crash with null char*

This is supported by the others operator+

Change-Id: I9a1d1a0afb63acf32935948111d43ca6da370363
Reviewed-on: http://codereview.qt.nokia.com/764
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/corelib/tools/qstringbuilder.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/corelib/tools/qstringbuilder.cpp')

diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp
index 45de6bc1c3..1cc7e5d2c3 100644
--- a/src/corelib/tools/qstringbuilder.cpp
+++ b/src/corelib/tools/qstringbuilder.cpp
@@ -162,6 +162,8 @@ void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out
     }
 #endif
     if (len == -1) {
+        if (!a)
+            return;
         while (*a)
             *out++ = QLatin1Char(*a++);
     } else {
-- 
cgit v1.2.3