diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-09 11:04:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 11:04:11 +0200 |
| commit | b4ed4e152e9853fe85492b10986f9923e703da73 (patch) | |
| tree | 250c4a54c121bc4d1e3fe25083d0b6cdf179ff87 /lib | |
| parent | 4277051442c2b6025da936493cb674dcf754d34c (diff) | |
| parent | f1cd68d71337d3419ea7fced7304bc2a763d29d4 (diff) | |
| download | nextcloud-server-b4ed4e152e9853fe85492b10986f9923e703da73.tar.gz nextcloud-server-b4ed4e152e9853fe85492b10986f9923e703da73.zip | |
Merge pull request #746 from nextcloud/jail-root
getJailedPath expects $path to have a trailing /
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/Cache/Wrapper/CacheJail.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php index d121ee25361..1196c6b0760 100644 --- a/lib/private/Files/Cache/Wrapper/CacheJail.php +++ b/lib/private/Files/Cache/Wrapper/CacheJail.php @@ -59,6 +59,9 @@ class CacheJail extends CacheWrapper { * @return null|string the jailed path or null if the path is outside the jail */ protected function getJailedPath($path) { + if ($this->root === '') { + return $path; + } $rootLength = strlen($this->root) + 1; if ($path === $this->root) { return ''; |