Merge 168692 - Apply missing kParentDirectory check

content/browser/child_process_security_policy_impl.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 "content/browser/child_process_security_policy_impl.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/platform_file.h"
@@ skipping 128 matching lines @@
         return request_file_set_.find(path) != request_file_set_.end();
     }
 
     return false;  // Unmentioned schemes are disallowed.
   }
 
   // Determine if the certain permissions have been granted to a file.
   bool HasPermissionsForFile(const FilePath& file, int permissions) {
     FilePath current_path = file.StripTrailingSeparators();
     FilePath last_path;
+    int skip = 0;
     while (current_path != last_path) {
-      if (file_permissions_.find(current_path) != file_permissions_.end())
-        return (file_permissions_[current_path] & permissions) == permissions;
+      FilePath base_name =  current_path.BaseName();
+      if (base_name.value() == FilePath::kParentDirectory) {
+        ++skip;
+      } else if (skip > 0) {
+        if (base_name.value() != FilePath::kCurrentDirectory)
+          --skip;
+      } else {
+        if (file_permissions_.find(current_path) != file_permissions_.end())
+          return (file_permissions_[current_path] & permissions) == permissions;
+      }
       last_path = current_path;
       current_path = current_path.DirName();
     }
 
     return false;
   }
 
   bool CanUseCookiesForOrigin(const GURL& gurl) {
     if (origin_lock_.is_empty())
       return true;
@@ skipping 460 matching lines @@
     int child_id,
     const std::string& filesystem_id,
     int permission) {
   base::AutoLock lock(lock_);
 
   SecurityStateMap::iterator state = security_state_.find(child_id);
   if (state == security_state_.end())
     return false;
   return state->second->HasPermissionsForFileSystem(filesystem_id, permission);
 }