diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-06-27 13:09:23 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-27 13:47:53 +0200 |
| commit | 53a16752c257d2f4f99ecef2cde1580b817fc12a (patch) | |
| tree | 1d1510797b67edcb5d9de0cb7de5128308d7800b /src/corelib/tools | |
| parent | 8fb4beb2a194f6a42e650c4d91bb4e25c916e5f6 (diff) | |
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>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qstringbuilder.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qstringbuilder.h | 2 |
2 files changed, 4 insertions, 0 deletions
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 { diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index 709d84a578..594ab2f183 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -352,6 +352,8 @@ template <> struct QConcatenable<const char *> : private QAbstractConcatenable #endif static inline void appendTo(const char *a, char *&out) { + if (!a) + return; while (*a) *out++ = *a++; } |