Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Unified Diff: net/base/dns_util_unittest.cc

Issue 919023003: DNSDomainFromDot: Reject empty labels. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/dns_util_unittest.cc
diff --git a/net/base/dns_util_unittest.cc b/net/base/dns_util_unittest.cc
index 06f1fb25877cc61cdc2688ef9e86c294777a19d5..55e40c119fb24f5e87e5f38a79af3d8b6996c10b 100644
--- a/net/base/dns_util_unittest.cc
+++ b/net/base/dns_util_unittest.cc
@@ -44,14 +44,12 @@ TEST_F(DNSUtilTest, DNSDomainFromDot) {
// 254 characters in the name: invalid
EXPECT_FALSE(DNSDomainFromDot("123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.1234", &out));
- // Zero length labels should be dropped.
- EXPECT_TRUE(DNSDomainFromDot("www.google.com.", &out));
- EXPECT_EQ(out, IncludeNUL("\003www\006google\003com"));
+ // Zero length labels should fail, except that one trailing dot is allowed
+ // (to disable suffix search):
+ EXPECT_FALSE(DNSDomainFromDot(".google.com", &out));
+ EXPECT_FALSE(DNSDomainFromDot("www..google.com", &out));
- EXPECT_TRUE(DNSDomainFromDot(".google.com", &out));
- EXPECT_EQ(out, IncludeNUL("\006google\003com"));
-
- EXPECT_TRUE(DNSDomainFromDot("www..google.com", &out));
+ EXPECT_TRUE(DNSDomainFromDot("www.google.com.", &out));
EXPECT_EQ(out, IncludeNUL("\003www\006google\003com"));
}

Powered by Google App Engine
This is Rietveld 408576698