diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-27 18:53:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-27 18:53:44 (GMT) |
| commit | 3c67a14ad0db0e83e70b2432394f168ce279518b (patch) | |
| tree | 77ba4c394f39886b21da6645723ebde9253788f2 /src/corelib/tools | |
| parent | b39dc4a9029040f43f1ca3ace6bf7e77740a3f39 (diff) | |
| parent | 007f01a7e801d5409708e4b8de8b3ead1481cf7d (diff) | |
| download | Qt-3c67a14ad0db0e83e70b2432394f168ce279518b.zip Qt-3c67a14ad0db0e83e70b2432394f168ce279518b.tar.gz Qt-3c67a14ad0db0e83e70b2432394f168ce279518b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Make it compile with openssl 1.0.0d, gcc 4.6
QStringBuilder: do not crash with null char*
Fix event delevery order
QSocketNotifier autotest - fix compile with MSVC
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 45de6bc..1cc7e5d 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 709d84a..594ab2f 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++; } |