From e806cd78897dfcb7122bc5a69993f2c6d0c1f7e2 Mon Sep 17 00:00:00 2001 From: "wez@chromium.org" Date: Fri, 17 May 2013 02:08:43 +0000 Subject: Protect against empty "labeled" DNS names in DnsTransaction. This CL makes the following changes: 1. DNSDomainFromDot fails for "empty" names such as "", ".", ".." etc. 2. Some additional unit-tests are added for DNSDomainFromDot(). 3. DnsTransaction now treats DNS names such as "." as invalid arguments. 4. Added a comment to SocketStreamDispatcherHost to clarify that SocketStreamHost is responsible for checking |url|. BUG=235161 Review URL: https://chromiumcodereview.appspot.com/14876023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200702 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/dns_util_unittest.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'net/base/dns_util_unittest.cc') diff --git a/net/base/dns_util_unittest.cc b/net/base/dns_util_unittest.cc index 103e9a7..1e1e4f0 100644 --- a/net/base/dns_util_unittest.cc +++ b/net/base/dns_util_unittest.cc @@ -19,8 +19,10 @@ static std::string IncludeNUL(const char* in) { TEST_F(DNSUtilTest, DNSDomainFromDot) { std::string out; - EXPECT_TRUE(DNSDomainFromDot("", &out)); - EXPECT_EQ(out, IncludeNUL("")); + EXPECT_FALSE(DNSDomainFromDot("", &out)); + EXPECT_FALSE(DNSDomainFromDot(".", &out)); + EXPECT_FALSE(DNSDomainFromDot("..", &out)); + EXPECT_TRUE(DNSDomainFromDot("com", &out)); EXPECT_EQ(out, IncludeNUL("\003com")); EXPECT_TRUE(DNSDomainFromDot("google.com", &out)); -- cgit v1.1