diff options
author | Robin Appelman <icewind@owncloud.com> | 2016-06-01 14:22:12 +0200 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2016-06-07 14:01:55 +0200 |
commit | 73547f29be4545b0080ec0581a114243707966d9 (patch) | |
tree | 40a8f7ec9324bdb506e4f075e39a5f054e7946d6 /lib/private | |
parent | 7b1b723e5b04173409117aca1f7e76bed5762d9f (diff) | |
download | nextcloud-server-73547f29be4545b0080ec0581a114243707966d9.tar.gz nextcloud-server-73547f29be4545b0080ec0581a114243707966d9.zip |
Ignore forbidden files while scanning
Diffstat (limited to 'lib/private')
-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) { |