Net: make IsSafePortableRelativePath look for reserved names on all components.

net/base/net_util.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/base/net_util.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 
@@ skipping 1134 matching lines @@
   SanitizeGeneratedFileName(&sanitized, true);
   base::FilePath::StringType extension = component.Extension();
   if (!extension.empty())
     extension.erase(extension.begin());  // Erase preceding '.'.
   return !component.empty() &&
          (component == component.BaseName()) &&
          (component == component.StripTrailingSeparators()) &&
          FilePathToString16(component, &component16) &&
          file_util::IsFilenameLegal(component16) &&
          !IsShellIntegratedExtension(extension) &&
-         (sanitized == component.value());
-}
-
-bool IsSafePortableBasename(const base::FilePath& filename) {
-  return IsSafePortablePathComponent(filename) &&
-         !IsReservedName(filename.value());
+         (sanitized == component.value()) &&
+         !IsReservedName(component.value());
 }
 
 bool IsSafePortableRelativePath(const base::FilePath& path) {
   if (path.empty() || path.IsAbsolute() || path.EndsWithSeparator())
     return false;
   std::vector<base::FilePath::StringType> components;
   path.GetComponents(&components);
   if (components.empty())
     return false;
   for (size_t i = 0; i < components.size() - 1; ++i) {
     if (!IsSafePortablePathComponent(base::FilePath(components[i])))
       return false;
   }
-  return IsSafePortableBasename(path.BaseName());
+  return IsSafePortablePathComponent(path.BaseName());
 }
 
 void GenerateSafeFileName(const std::string& mime_type,
                           bool ignore_extension,
                           base::FilePath* file_path) {
   // Make sure we get the right file extension
   EnsureSafeExtension(mime_type, ignore_extension, file_path);
 
 #if defined(OS_WIN)
   // Prepend "_" to the file name if it's a reserved name
@@ skipping 976 matching lines @@
 
 NetworkInterface::NetworkInterface(const std::string& name,
                                    const IPAddressNumber& address)
     : name(name), address(address) {
 }
 
 NetworkInterface::~NetworkInterface() {
 }
 
 }  // namespace net