diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2018-03-14 12:13:55 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-03-16 00:01:53 +0000 |
commit | 2fb706f9a842474e534e7c6e2915d9096f5a10d1 (patch) | |
tree | e815c303889992d947c27a55d69274fc023d1f2b /tests/auto/corelib/io | |
parent | 53f82185e9320e0561d5a424d7145aadc18cca30 (diff) |
QIpAddress: reject IPv6 addresses with more than 4 hex digits
Matches glibc commit 9a0cc8c1bd7645bf3c988890ffb59639c07a5812.
[ChangeLog][QtCore][QUrl] Fixed a bug in parsing IPv6 addresses with
more than 4 hex digits in a component.
[ChangeLog][QtNetwork][QHostAddress] Fixed a bug in parsing IPv6
addresses with more than 4 hex digits in a component.
[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=9a0cc8c1bd7645bf3c988890ffb59639c07a5812
Change-Id: I2701038131d91eb108aebb3bec16278e4efe3de2
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'tests/auto/corelib/io')
-rw-r--r-- | tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp b/tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp index ba5e9eaaa1..d41efa18f5 100644 --- a/tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp +++ b/tests/auto/corelib/io/qipaddress/tst_qipaddress.cpp @@ -288,9 +288,6 @@ void tst_QIpAddress::parseIp6_data() << "ffee:ddcc:bbaa:9988:7766:5544:3322:1100" << Ip6(0xffee, 0xddcc, 0xbbaa, 0x9988, 0x7766, 0x5544, 0x3322, 0x1100); - // too many zeroes - QTest::newRow("0:0:0:0:0:0:0:00103") << "0:0:0:0:0:0:0:00103" << Ip6(0,0,0,0,0,0,0,0x103); - // double-colon QTest::newRow("::1:2:3:4:5:6:7") << "::1:2:3:4:5:6:7" << Ip6(0,1,2,3,4,5,6,7); QTest::newRow("1:2:3:4:5:6:7::") << "1:2:3:4:5:6:7::" << Ip6(1,2,3,4,5,6,7,0); @@ -382,6 +379,9 @@ void tst_QIpAddress::invalidParseIp6_data() // too big number QTest::newRow("0:0:0:0:0:0:0:10103") << "0:0:0:0:0:0:0:10103"; + // too many zeroes + QTest::newRow("0:0:0:0:0:0:0:00103") << "0:0:0:0:0:0:0:00103"; + // too short QTest::newRow("0:0:0:0:0:0:0:") << "0:0:0:0:0:0:0:"; QTest::newRow("0:0:0:0:0:0:0") << "0:0:0:0:0:0:0"; @@ -438,6 +438,8 @@ void tst_QIpAddress::invalidParseIp6() #if defined(__GLIBC__) && defined(AF_INET6) Ip6 inet_result; bool inet_ok = inet_pton(AF_INET6, address.toLatin1(), &inet_result.u8); + if (__GLIBC_MINOR__ < 26) + QEXPECT_FAIL("0:0:0:0:0:0:0:00103", "Bug fixed in glibc 2.26", Continue); QVERIFY(!inet_ok); #endif |