summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2024-02-23 16:07:43 +0100
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2024-02-26 07:45:04 +0000
commitd718a2adb1c8c837c467fd2b707f2e7384df28be (patch)
treec7d6765758e1451f8ab913ac194994f52dcbd63d
parent259073f8067cb5ba5ee6c735a8bd7ab55abc4147 (diff)
downloadnextcloud-server-d718a2adb1c8c837c467fd2b707f2e7384df28be.tar.gz
nextcloud-server-d718a2adb1c8c837c467fd2b707f2e7384df28be.zip
fix: Throw instead of yielding nothing when listing local directories
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r--lib/private/Files/Storage/Common.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index cd9a05a2a1d..0f48db0650c 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -61,6 +61,7 @@ use OCP\Files\ReservedWordException;
use OCP\Files\Storage\ILockingStorage;
use OCP\Files\Storage\IStorage;
use OCP\Files\Storage\IWriteStreamStorage;
+use OCP\Files\StorageNotAvailableException;
use OCP\Lock\ILockingProvider;
use OCP\Lock\LockedException;
use Psr\Log\LoggerInterface;
@@ -894,6 +895,11 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
public function getDirectoryContent($directory): \Traversable {
$dh = $this->opendir($directory);
+
+ if ($dh === false) {
+ throw new StorageNotAvailableException('Directory listing failed');
+ }
+
if (is_resource($dh)) {
$basePath = rtrim($directory, '/');
while (($file = readdir($dh)) !== false) {