diff options
| author | Robin Appelman <icewind@owncloud.com> | 2016-06-01 14:22:12 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-06-09 14:00:01 +0200 |
| commit | ea6921da3b597b4fdf66648c6fe9b1c73f264938 (patch) | |
| tree | 88550bbbd117acb952e4245a10470446dcb1a636 | |
| parent | bee918693a70427efc2f33034176e89d7a776bc3 (diff) | |
| download | nextcloud-server-ea6921da3b597b4fdf66648c6fe9b1c73f264938.tar.gz nextcloud-server-ea6921da3b597b4fdf66648c6fe9b1c73f264938.zip | |
Ignore forbidden files while scanning
| -rw-r--r-- | lib/private/Files/Cache/Scanner.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php index e6bd118d5a5..c17f9bfd51b 100644 --- a/lib/private/Files/Cache/Scanner.php +++ b/lib/private/Files/Cache/Scanner.php @@ -38,6 +38,7 @@ use OC\Files\Filesystem; use OC\Hooks\BasicEmitter; use OCP\Config; use OCP\Files\Cache\IScanner; +use OCP\Files\ForbiddenException; use OCP\Files\Storage\ILockingStorage; use OCP\Lock\ILockingProvider; @@ -140,7 +141,11 @@ class Scanner extends BasicEmitter implements IScanner { } } - $data = $this->getData($file); + try { + $data = $this->getData($file); + } catch (ForbiddenException $e) { + return null; + } if ($data) { |