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

QUrl: improve parseIp6's use of QStringView

Browse Source 
Change-Id: I55083c2909f64a1f8868fffd164f20a2fb8ff7f6
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Thiago Macieira 2020-12-09 10:44:36 -08:00
parent 08f1d6f3df
commit 37917b9461
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/io/qurl.cpp
View File

@ -1252,12 +1252,10 @@ static const QChar *parseIp6(QString &host, const QChar *begin, const QChar *end
QIPAddressUtils::IPv6Address address;
QStringView zoneId;
const QChar *endBeforeZoneId = decoded.constEnd();
int zoneIdPosition = decoded.indexOf(zoneIdIdentifier);
if ((zoneIdPosition != -1) && (decoded.lastIndexOf(zoneIdIdentifier) == zoneIdPosition)) {
zoneId = decoded.mid(zoneIdPosition + zoneIdIdentifier.size());
endBeforeZoneId = decoded.constBegin() + zoneIdPosition;
decoded.truncate(zoneIdPosition);
// was there anything after the zone ID separator?
if (zoneId.isEmpty())
@ -1266,14 +1264,14 @@ static const QChar *parseIp6(QString &host, const QChar *begin, const QChar *end
// did the address become empty after removing the zone ID?
// (it might have always been empty)
if (decoded.constBegin() == endBeforeZoneId)
if (decoded.isEmpty())
return end;
const QChar *ret = QIPAddressUtils::parseIp6(address, decoded.constBegin(), endBeforeZoneId);
const QChar *ret = QIPAddressUtils::parseIp6(address, decoded.constBegin(), decoded.constEnd());
if (ret)
return begin + (ret - decoded.constBegin());
host.reserve(host.size() + (decoded.constEnd() - decoded.constBegin()));
host.reserve(host.size() + (end - begin) + 2); // +2 for the brackets
host += QLatin1Char('[');
QIPAddressUtils::toString(host, address);