summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-09-09 21:52:36 +0200
committerGitHub <noreply@github.com>2020-09-09 21:52:36 +0200
commit6895d97cf0252affa572ef117d7c4f65bca6c7f3 (patch)
treed3d91bf07c90683fd4b06aab9d6a4c75bac88874 /lib/private
parente7f03486ad8f1975c3e62b1433095e5d72ddfa90 (diff)
parenta792a51dca5fe55f3c05483e779958e4d56cdb9a (diff)
downloadnextcloud-server-6895d97cf0252affa572ef117d7c4f65bca6c7f3.tar.gz
nextcloud-server-6895d97cf0252affa572ef117d7c4f65bca6c7f3.zip
Merge pull request #22520 from nextcloud/normalize-path-invalid-utf8
dont use `false` as cache key for non utf8 path in normalizePath
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Files/Filesystem.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index 6352834be89..0a0707df73d 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -814,7 +814,7 @@ class Filesystem {
$cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath, $keepUnicode]);
- if (isset(self::$normalizedPathCache[$cacheKey])) {
+ if ($cacheKey && isset(self::$normalizedPathCache[$cacheKey])) {
return self::$normalizedPathCache[$cacheKey];
}