diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-06-27 11:09:23 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-06-27 14:30:55 (GMT) |
| commit | b2e678bfd4f190ab27cb380201207d8f227f0739 (patch) | |
| tree | 1830b50438d9a439a47322cb9412565e521d482e /tests | |
| parent | 2ff9617cd6093a758dddea5ce50d1efd6e98ded8 (diff) | |
| download | Qt-b2e678bfd4f190ab27cb380201207d8f227f0739.zip Qt-b2e678bfd4f190ab27cb380201207d8f227f0739.tar.gz Qt-b2e678bfd4f190ab27cb380201207d8f227f0739.tar.bz2 | |
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: hjk
(cherry picked from commit 53a16752c257d2f4f99ecef2cde1580b817fc12a)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qstringbuilder1/stringbuilder.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/qstringbuilder1/stringbuilder.cpp b/tests/auto/qstringbuilder1/stringbuilder.cpp index 2327ef5..de7ad65 100644 --- a/tests/auto/qstringbuilder1/stringbuilder.cpp +++ b/tests/auto/qstringbuilder1/stringbuilder.cpp @@ -133,6 +133,12 @@ void runScenario() QCOMPARE(r, string); r = string P ba; QCOMPARE(r, string); + + const char *zero = 0; + r = string P zero; + QCOMPARE(r, string); + r = zero P string; + QCOMPARE(r, string); #endif string = QString::fromLatin1(LITERAL); @@ -161,6 +167,12 @@ void runScenario() QCOMPARE(r, r2); r2 = QByteArray("hello\0") P UTF8_LITERAL; QCOMPARE(r, r2); + + const char *zero = 0; + r = ba P zero; + QCOMPARE(r, ba); + r = zero P ba; + QCOMPARE(r, ba); } //operator QString += |