Merge 22260 - When a content script has a match pattern of http://*/*, we...

chrome/common/extensions/url_pattern.cc

 // Copyright (c) 2006-2009 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 "chrome/common/extensions/url_pattern.h"
 
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "chrome/common/url_constants.h"
 
@@ skipping 76 matching lines @@
   if (!MatchesHost(test))
     return false;
 
   if (!MatchesPath(test))
     return false;
 
   return true;
 }
 
 bool URLPattern::MatchesHost(const GURL& test) const {
+  // If the hosts are exactly equal, we have a match.
   if (test.host() == host_)
     return true;
 
-  if (!match_subdomains_ || test.HostIsIPAddress())
+  // If we're matching subdomains, and we have no host in the match pattern,
+  // that means that we're matching all hosts, which means we have a match no
+  // matter what the test host is.
+  if (match_subdomains_ && host_.empty())
+    return true;
+
+  // Otherwise, we can only match if our match pattern matches subdomains.
+  if (!match_subdomains_)
     return false;
 
-  // If we're matching subdomains, and we have no host, that means the pattern
-  // was <scheme>://*/<whatever>, so we match anything.
-  if (host_.empty())
-    return true;
+  // We don't do subdomain matching against IP addresses, so we can give up now
+  // if the test host is an IP address.
+  if (test.HostIsIPAddress())
+    return false;
 
   // Check if the test host is a subdomain of our host.
   if (test.host().length() <= (host_.length() + 1))
     return false;
 
   if (test.host().compare(test.host().length() - host_.length(),
                           host_.length(), host_) != 0)
     return false;
 
   return test.host()[test.host().length() - host_.length() - 1] == '.';
@@ skipping 22 matching lines @@
   }
 
   if (!host_.empty())
     spec += host_;
 
   if (!path_.empty())
     spec += path_;
 
   return spec;
 }