summaryrefslogtreecommitdiffstats
path: root/base/base_paths_mac.mm
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 00:48:48 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 00:48:48 +0000
commit872b3cc46b2b2a89d2f985c78745d5f7c34dde77 (patch)
tree9683a5e5eb8c7b08495835a74953631d5232a8ec /base/base_paths_mac.mm
parent1e2d98179903924c67ad0765425e99df87ff3b28 (diff)
downloadchromium_src-872b3cc46b2b2a89d2f985c78745d5f7c34dde77.zip
chromium_src-872b3cc46b2b2a89d2f985c78745d5f7c34dde77.tar.gz
chromium_src-872b3cc46b2b2a89d2f985c78745d5f7c34dde77.tar.bz2
Fix many test case failures when run isolated on OSX.
For an unknown reason, DIR_SOURCE_ROOT may return a path with '..' in it, which triggers the security check added in r175642. This only seems to happen when called inside isolate.py. Fix the issue whoesale by enforcing an absolute path. R=mark@chromium.org BUG=168890 Review URL: https://chromiumcodereview.appspot.com/12038049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base_paths_mac.mm')
-rw-r--r--base/base_paths_mac.mm3
1 files changed, 3 insertions, 0 deletions
diff --git a/base/base_paths_mac.mm b/base/base_paths_mac.mm
index 630f742..d217d90 100644
--- a/base/base_paths_mac.mm
+++ b/base/base_paths_mac.mm
@@ -90,6 +90,9 @@ bool PathProviderMac(int key, FilePath* result) {
*result = result->DirName().DirName();
}
#endif
+ if (result->ReferencesParent()) {
+ return file_util::AbsolutePath(result);
+ }
return true;
case base::DIR_USER_DESKTOP:
#if defined(OS_IOS)