diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-08-25 14:06:48 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-17 11:35:16 +0200 |
| commit | d25a9a118f7824a72f193d57373355e51323f118 (patch) | |
| tree | 4606bdc2487dac92c30ad117755c89cc13f91b6b /lib | |
| parent | ab79caf29bf4173e15f9dad00a206c6bb1f3999c (diff) | |
| download | nextcloud-server-d25a9a118f7824a72f193d57373355e51323f118.tar.gz nextcloud-server-d25a9a118f7824a72f193d57373355e51323f118.zip | |
Check if a folder is deletable before we try to recursively delete it
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/storage/local.php | 3 | ||||
| -rw-r--r-- | lib/private/files/storage/mappedlocal.php | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index 9df6cdef2af..0a612ae505b 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -39,6 +39,9 @@ if (\OC_Util::runningOnWindows()) { } public function rmdir($path) { + if (!$this->isDeletable($path)) { + return false; + } try { $it = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator($this->datadir . $path), diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php index 0760d842eaf..0a21d2938b7 100644 --- a/lib/private/files/storage/mappedlocal.php +++ b/lib/private/files/storage/mappedlocal.php @@ -38,6 +38,9 @@ class MappedLocal extends \OC\Files\Storage\Common { } public function rmdir($path) { + if (!$this->isDeletable($path)) { + return false; + } try { $it = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator($this->buildPath($path)), |