AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port qt_check_std3rules() to QStringView

Browse Source 
Also port its callees. These functions scream to the QStringView-ified...

Change-Id: I13c95d65941eb8d02223306d80efd1437b4bd9b7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Marc Mutz 2020-05-11 15:49:19 +02:00
parent 554ef6c39c
commit b49314af1d
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qurl_p.h
View File

@ -67,7 +67,7 @@ enum AceLeadingDot { AllowLeadingDot, ForbidLeadingDot };
enum AceOperation { ToAceOnly, NormalizeAce };
extern QString qt_ACE_do(QStringView domain, AceOperation op, AceLeadingDot dot);
extern Q_AUTOTEST_EXPORT bool qt_nameprep(QString *source, int from);
extern Q_AUTOTEST_EXPORT bool qt_check_std3rules(const QChar *uc, int len);
extern Q_AUTOTEST_EXPORT bool qt_check_std3rules(QStringView in);
extern Q_AUTOTEST_EXPORT void qt_punycodeEncoder(const QChar *s, int ucLength, QString *output);
extern Q_AUTOTEST_EXPORT QString qt_punycodeDecoder(const QString &pc);
extern Q_AUTOTEST_EXPORT QString qt_urlRecodeByteArray(const QByteArray &ba);

26
src/corelib/io/qurlidna.cpp
View File

@ -2119,13 +2119,16 @@ Q_AUTOTEST_EXPORT bool qt_nameprep(QString *source, int from)
return true;
}
static const QChar *qt_find_nonstd3(const QChar *uc, int len, Qt::CaseSensitivity cs)
static const QChar *qt_find_nonstd3(QStringView in, Qt::CaseSensitivity cs)
{
const QChar * const uc = in.data();
const qsizetype len = in.size();
if (len > 63)
return uc;
for (int i = 0; i < len; ++i) {
ushort c = uc[i].unicode();
for (qsizetype i = 0; i < len; ++i) {
const char16_t c = uc[i].unicode();
if (c == '-' && (i == 0 || i == len - 1))
return uc + i;
@ -2145,22 +2148,21 @@ static const QChar *qt_find_nonstd3(const QChar *uc, int len, Qt::CaseSensitivit
return nullptr;
}
Q_AUTOTEST_EXPORT bool qt_check_std3rules(const QChar *uc, int len)
Q_AUTOTEST_EXPORT bool qt_check_std3rules(QStringView in)
{
return qt_find_nonstd3(uc, len, Qt::CaseInsensitive) == nullptr;
return qt_find_nonstd3(in, Qt::CaseInsensitive) == nullptr;
}
static bool qt_check_nameprepped_std3(const QChar *in, int len)
static bool qt_check_nameprepped_std3(QStringView in)
{
// fast path: check for lowercase ASCII
const QChar *firstNonAscii = qt_find_nonstd3(in, len, Qt::CaseSensitive);
const QChar *firstNonAscii = qt_find_nonstd3(in, Qt::CaseSensitive);
if (firstNonAscii == nullptr) {
// everything was lowercase ASCII, digits or hyphen
return true;
}
const QChar *e = in + len;
QString origin = QString::fromRawData(firstNonAscii, e - firstNonAscii);
QString origin = QString::fromRawData(firstNonAscii, in.end() - firstNonAscii);
QString copy = origin;
qt_nameprep(&copy, 0);
return origin == copy;
@ -2548,7 +2550,7 @@ QString qt_ACE_do(QStringView domain, AceOperation op, AceLeadingDot dot)
if (simple) {
// fastest case: this is the common case (non IDN-domains)
// so we're done
if (!qt_check_std3rules(result.constData() + prevLen, labelLength))
if (!qt_check_std3rules(QStringView{result.constData() + prevLen, labelLength}))
return QString();
} else {
// Punycode encoding and decoding cannot be done in-place
@ -2567,7 +2569,7 @@ QString qt_ACE_do(QStringView domain, AceOperation op, AceLeadingDot dot)
QString tmp = qt_punycodeDecoder(aceForm);
if (tmp.isEmpty())
return QString(); // shouldn't happen, since we've just punycode-encoded it
if (qt_check_nameprepped_std3(tmp.constData(), tmp.size())) {
if (qt_check_nameprepped_std3(tmp)) {
result.resize(prevLen + tmp.size());
memcpy(result.data() + prevLen, tmp.constData(), tmp.size() * sizeof(QChar));
appended = true;
@ -2579,7 +2581,7 @@ QString qt_ACE_do(QStringView domain, AceOperation op, AceLeadingDot dot)
memcpy(result.data() + prevLen, aceForm.constData(), aceForm.size() * sizeof(QChar));
}
if (!qt_check_std3rules(aceForm.constData(), aceForm.size()))
if (!qt_check_std3rules(aceForm))
return QString();
}

2
tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp
View File

@ -755,7 +755,7 @@ void tst_QUrlInternal::std3violations()
{
QString prepped = source;
qt_nameprep(&prepped, 0);
QVERIFY(!qt_check_std3rules(prepped.constData(), prepped.length()));
QVERIFY(!qt_check_std3rules(prepped));
}
#endif