1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QUrl: fix parsing of empty IPv6 addresses

Browse Source 
There's an assertion. Found by Google fuzz scan of CBOR data.

Pick-to: 6.0 5.15
Change-Id: I55083c2909f64a1f8868fffd164f1ff3af71605b
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Thiago Macieira 2020-12-09 10:32:03 -08:00
parent 2bed336599
commit 4a1091f489
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1261,10 +1261,16 @@ static const QChar *parseIp6(QString &host, const QChar *begin, const QChar *end
zoneId = decoded.mid(zoneIdPosition + zoneIdIdentifier.size()); zoneId = decoded.mid(zoneIdPosition + zoneIdIdentifier.size());
endBeforeZoneId = decoded.constBegin() + zoneIdPosition; endBeforeZoneId = decoded.constBegin() + zoneIdPosition;
// was there anything after the zone ID separator?
if (zoneId.isEmpty()) if (zoneId.isEmpty())
return end; return end;
} }
// did the address become empty after removing the zone ID?
// (it might have always been empty)
if (decoded.constBegin() == endBeforeZoneId)
return end;
const QChar *ret = QIPAddressUtils::parseIp6(address, decoded.constBegin(), endBeforeZoneId); const QChar *ret = QIPAddressUtils::parseIp6(address, decoded.constBegin(), endBeforeZoneId);
if (ret) if (ret)
return begin + (ret - decoded.constBegin()); return begin + (ret - decoded.constBegin());

2
tests/auto/corelib/io/qurl/tst_qurl.cpp
View File

@ -1909,6 +1909,8 @@ void tst_QUrl::ipv6_data()
QTest::addColumn<bool>("isValid"); QTest::addColumn<bool>("isValid");
QTest::addColumn<QString>("output"); QTest::addColumn<QString>("output");
QTest::newRow("empty") << "//[]" << false << "";
QTest::newRow("case 1") << QString::fromLatin1("//[56:56:56:56:56:56:56:56]") << true QTest::newRow("case 1") << QString::fromLatin1("//[56:56:56:56:56:56:56:56]") << true
<< "//[56:56:56:56:56:56:56:56]"; << "//[56:56:56:56:56:56:56:56]";
QTest::newRow("case 2") << QString::fromLatin1("//[::56:56:56:56:56:56:56]") << true QTest::newRow("case 2") << QString::fromLatin1("//[::56:56:56:56:56:56:56]") << true