Catch more invalid cache source storage paths

joshtrichards · kesselb · commit 939e7361e764 · 2023-12-01T16:36:11.000+01:00
OC\Files\Cache\Cache::get can return string|false|null, not just string|false. - #26270 added handling of false, but null is needed too. - Well, or we change the default $resullt to false, but I'm not sure if that has other ramifications and the real need here is to simply catch situations where the cache source storage path is not valid for whatever reason Related: #19009 Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
@@ -660,7 +660,7 @@ public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
 			$targetPath = $this->normalize($targetPath);
 
 			$sourceData = $sourceCache->get($sourcePath);
-			if ($sourceData === false) {
+			if ($sourceData === false || $sourceData === null) {
 				throw new \Exception('Invalid source storage path: ' . $sourcePath);
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {`
`660`	`660`	`$targetPath = $this->normalize($targetPath);`
`661`	`661`
`662`	`662`	`$sourceData = $sourceCache->get($sourcePath);`
`663`		`- if ($sourceData === false) {`
	`663`	`+ if ($sourceData === false \|\| $sourceData === null) {`
`664`	`664`	`throw new \Exception('Invalid source storage path: ' . $sourcePath);`
`665`	`665`	`}`
`666`	`666`