aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/private/Files/Storage/Local.php11
-rw-r--r--lib/private/Files/Storage/Wrapper/Availability.php1
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index 8a8e570d502..d3655d33543 100644
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -435,8 +435,15 @@ class Local extends \OC\Files\Storage\Common {
return $result;
}
- public function hash($type, $path, $raw = false) {
- return hash_file($type, $this->getSourcePath($path), $raw);
+ public function hash($type, $path, $raw = false): string|false {
+ /** @var string|false|null */
+ $hash = hash_file($type, $this->getSourcePath($path), $raw);
+
+ if ($hash === null) {
+ return false;
+ }
+
+ return $hash;
}
public function free_space($path) {
diff --git a/lib/private/Files/Storage/Wrapper/Availability.php b/lib/private/Files/Storage/Wrapper/Availability.php
index 693d943f0dc..bab43977b60 100644
--- a/lib/private/Files/Storage/Wrapper/Availability.php
+++ b/lib/private/Files/Storage/Wrapper/Availability.php
@@ -334,6 +334,7 @@ class Availability extends Wrapper {
return parent::hash($type, $path, $raw);
} catch (StorageNotAvailableException $e) {
$this->setUnavailable($e);
+ return false;
}
}