properly handle cases where cache wrappers block access

`CacheWrapper::formatCacheEntry` can return false for files that should be filtered out

Signed-off-by: Robin Appelman <robin@icewind.nl>

2 files changed, 4 insertions, 3 deletions

diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
index 540b6f7b8c3..7183a6c0d2a 100644
--- a/lib/private/Files/Cache/Wrapper/CacheJail.php
+++ b/lib/private/Files/Cache/Wrapper/CacheJail.php
@@ -328,7 +328,7 @@ class CacheJail extends CacheWrapper {
 		if ($rawEntry) {
 			$jailedPath = $this->getJailedPath($rawEntry->getPath());
 			if ($jailedPath !== null) {
-				return $this->formatCacheEntry(clone $rawEntry);
+				return $this->formatCacheEntry(clone $rawEntry) ?: null;
 			}
 		}
 
diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
index 8b8b4b6af80..e5300dc75f5 100644
--- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php
+++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
@@ -60,7 +60,7 @@ class CacheWrapper extends Cache {
 	 * Make it easy for wrappers to modify every returned cache entry
 	 *
 	 * @param ICacheEntry $entry
-	 * @return ICacheEntry
+	 * @return ICacheEntry|false
 	 */
 	protected function formatCacheEntry($entry) {
 		return $entry;
@@ -311,7 +311,8 @@ class CacheWrapper extends Cache {
 	public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
 		$rawEntry = $this->getCache()->getCacheEntryFromSearchResult($rawEntry);
 		if ($rawEntry) {
-			return $this->formatCacheEntry(clone $rawEntry);
+			$entry = $this->formatCacheEntry(clone $rawEntry);
+			return $entry ?: null;
 		}
 
 		return null;