DNSDomainFromDot: Reject empty labels.

net/dns/host_resolver_proc.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/dns/host_resolver_proc.h"
 
 #include "build/build_config.h"
 
 #include "base/logging.h"
 #include "base/sys_byteorder.h"
 #include "net/base/address_list.h"
 #include "net/base/dns_reloader.h"
+#include "net/base/dns_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/sys_addrinfo.h"
 
 #if defined(OS_OPENBSD)
 #define AI_ADDRCONFIG 0
 #endif
 
 namespace net {
 
 namespace {
@@ skipping 94 matching lines @@
 // static
 HostResolverProc* HostResolverProc::GetDefault() {
   return default_proc_;
 }
 
 int SystemHostResolverCall(const std::string& host,
                            AddressFamily address_family,
                            HostResolverFlags host_resolver_flags,
                            AddressList* addrlist,
                            int* os_error) {
+  // Make sure |host| is properly formed.
+  {
+    std::string out_ignored;
+    if (!DNSDomainFromDot(host, &out_ignored))
+      return ERR_NAME_NOT_RESOLVED;
+  }

[Ryan Sleevi, 2015/03/06 22:11:36]

Don't use { } here.

+
   if (os_error)
     *os_error = 0;
 
   struct addrinfo* ai = NULL;
   struct addrinfo hints = {0};
 
   switch (address_family) {
     case ADDRESS_FAMILY_IPV4:
       hints.ai_family = AF_INET;
       break;
@@ skipping 121 matching lines @@
   return SystemHostResolverCall(hostname,
                                 address_family,
                                 host_resolver_flags,
                                 addr_list,
                                 os_error);
 }
 
 SystemHostResolverProc::~SystemHostResolverProc() {}
 
 }  // namespace net