diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-31 14:55:57 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-29 18:15:27 +0200 |
commit | 78cf89c07d7fa834a455afa5862823e50171415c (patch) | |
tree | 4cd4fc6347c3df2771f49763231fb2d91b5582d9 /tests | |
parent | ab5e444c8fd754321ef0a6b084248e431e84a7a8 (diff) |
Use checked string iteration in case conversions
The Unicode table code can only be safely called on valid code-points.
So code that calls it must only pass it valid Unicode data. The string
iterator's Unchecked Unchecked methods only provide this guarantee
when the string being iterated is guaranteed to be valid UTF-16; while
client code should only use QString, QStringView and friends on valid
UTF-16 data, we have no way to be sure they have respected that.
So take the few extra cycles to actually check validity in the course
of iterating strings, when the resulting code-points are to be passed
to the Unicode table look-ups. Add tests that case mapping doesn't
access Unicode tables out of range (it'll trigger the new assertion).
Added some comments to qchar.h that helped me understand surrogates.
Change-Id: Iec2c3106bf1a875bdaa1d622f6cf94d7007e281e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/corelib/text/qstring/tst_qstring.cpp | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp index 126bc08903..ad59025dfe 100644 --- a/tests/auto/corelib/text/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp @@ -458,6 +458,8 @@ private slots: void simplified_data(); void simplified(); void trimmed(); + void unicodeTableAccess_data(); + void unicodeTableAccess(); void toUpper(); void toLower(); void isLower_isUpper_data(); @@ -1949,6 +1951,32 @@ void tst_QString::rightJustified() QCOMPARE(a, QLatin1String("ABC")); } +void tst_QString::unicodeTableAccess_data() +{ + QTest::addColumn<QString>("invalid"); + + const auto join = [](char16_t high, char16_t low) { + const QChar pair[2] = { high, low }; + return QString(pair, 2); + }; + // Least high surrogate for which an invalid successor produces an error: + QTest::newRow("least-high") << join(0xdbf8, 0xfc00); + // Least successor that, after a high surrogate, produces invalid: + QTest::newRow("least-follow") << join(0xdbff, 0xe000); +} + +void tst_QString::unicodeTableAccess() +{ + // QString processing must not access unicode tables out of bounds. + QFETCH(QString, invalid); + // Exercise methods, to see if any assertions trigger: + const auto upper = invalid.toUpper(); + const auto lower = invalid.toLower(); + const auto folded = invalid.toCaseFolded(); + // Fatuous test, just to use those. + QVERIFY(upper == invalid || lower == invalid || folded == invalid || lower != upper); +} + void tst_QString::toUpper() { QCOMPARE( QString().toUpper(), QString() ); |