summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-08-30 19:48:37 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-08-30 19:48:37 +0200
commitb50ac6ff2fa632a0f9a07a91582b6b2de613e8ad (patch)
tree23c787bf5759baf48634cf340799ba859cbfd5e4 /lib
parent3eee9a2e4833a8850df6ca5c967457dc8be3fd9f (diff)
parent4cb8ca186097de43e48c1d99f83f30704313dab3 (diff)
downloadnextcloud-server-b50ac6ff2fa632a0f9a07a91582b6b2de613e8ad.tar.gz
nextcloud-server-b50ac6ff2fa632a0f9a07a91582b6b2de613e8ad.zip
Merge pull request #10149 from owncloud/storage-wrapper-check
Check result of storage wrappers
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/storage/storagefactory.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/files/storage/storagefactory.php b/lib/private/files/storage/storagefactory.php
index 62b393c845c..e8df5090f09 100644
--- a/lib/private/files/storage/storagefactory.php
+++ b/lib/private/files/storage/storagefactory.php
@@ -99,6 +99,9 @@ class StorageFactory implements IStorageFactory {
}, $wrappers);
foreach ($wrappers as $wrapper) {
$storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint);
+ if (!($storage instanceof \OCP\Files\Storage)) {
+ throw new \Exception('Invalid result from storage wrapper');
+ }
}
return $storage;
}