mirror of
https://github.com/nextcloud/server.git
synced 2026-02-19 02:38:40 -05:00
fix: don't return null for SharedStorage::getWrapperStorage with share recursion
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
parent
d3da21b10a
commit
0ace9a4efa
1 changed files with 10 additions and 0 deletions
|
|
@ -137,6 +137,16 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
|
|||
|
||||
private function init() {
|
||||
if ($this->initialized) {
|
||||
if (!$this->storage) {
|
||||
// marked as initialized but no storage set
|
||||
// this is probably because some code path has caused recursion during the share setup
|
||||
// we setup a "failed storage" so `getWrapperStorage` doesn't return null.
|
||||
// If the share setup completes after this the "failed storage" will be overwritten by the correct one
|
||||
$this->logger->warning('Possible share setup recursion detected');
|
||||
$this->storage = new FailedStorage(['exception' => new \Exception('Possible share setup recursion detected')]);
|
||||
$this->cache = new FailedCache();
|
||||
$this->rootPath = '';
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue