From 1bc388e5074055e67a961eef42ffa4953b9a3c98 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Tue, 16 Oct 2018 10:57:37 +0200 Subject: [PATCH] Double check for failed cache with a shared storage When obtaining the SourceRootInfo we can call init. If this fails the cache is set to a failed cache and the storage to a failed storage. However we did not check for this. Which means that if the storage was invalid it would fail later on. Now we will properly error out. Signed-off-by: Roeland Jago Douma --- apps/files_sharing/lib/SharedStorage.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index 34a21fcd63..f9c4a85fac 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -378,10 +378,12 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto if (!$storage) { $storage = $this; } + $sourceRoot = $this->getSourceRootInfo(); if ($this->storage instanceof FailedStorage) { return new FailedCache(); } - $this->cache = new \OCA\Files_Sharing\Cache($storage, $this->getSourceRootInfo(), $this->superShare); + + $this->cache = new \OCA\Files_Sharing\Cache($storage, $sourceRoot, $this->superShare); return $this->cache; }