aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerdinand Thiessen <opensource@fthiessen.de>2025-01-28 20:51:42 +0100
committerFerdinand Thiessen <opensource@fthiessen.de>2025-01-28 20:51:42 +0100
commit67e0ef5b72ecfa92bdee0808fc12a809e9e17980 (patch)
treef729ed9159c816cb176133a24bc08d0098fe2db7
parent54a1a560bd92786831875d3002937a4742e73e8a (diff)
downloadnextcloud-server-67e0ef5b72ecfa92bdee0808fc12a809e9e17980.tar.gz
nextcloud-server-67e0ef5b72ecfa92bdee0808fc12a809e9e17980.zip
fix(files): Do not array access null valuefix/encoding-wrapper-scanner-stable30
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
-rw-r--r--lib/private/Files/Storage/Wrapper/Encoding.php4
-rw-r--r--tests/lib/Files/Storage/Wrapper/EncodingTest.php8
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/private/Files/Storage/Wrapper/Encoding.php b/lib/private/Files/Storage/Wrapper/Encoding.php
index 11f21eb828e..caaba22b05f 100644
--- a/lib/private/Files/Storage/Wrapper/Encoding.php
+++ b/lib/private/Files/Storage/Wrapper/Encoding.php
@@ -510,7 +510,9 @@ class Encoding extends Wrapper {
public function getMetaData($path) {
$entry = $this->storage->getMetaData($this->findPathToUse($path));
- $entry['name'] = trim(Filesystem::normalizePath($entry['name']), '/');
+ if ($entry !== null) {
+ $entry['name'] = trim(Filesystem::normalizePath($entry['name']), '/');
+ }
return $entry;
}
diff --git a/tests/lib/Files/Storage/Wrapper/EncodingTest.php b/tests/lib/Files/Storage/Wrapper/EncodingTest.php
index ae6a6ece742..b50d6f985f1 100644
--- a/tests/lib/Files/Storage/Wrapper/EncodingTest.php
+++ b/tests/lib/Files/Storage/Wrapper/EncodingTest.php
@@ -240,4 +240,12 @@ class EncodingTest extends \Test\Files\Storage\Storage {
$entry = $this->instance->getMetaData('/test/' . self::NFD_NAME);
$this->assertEquals(self::NFC_NAME, $entry['name']);
}
+
+ /**
+ * Regression test of https://github.com/nextcloud/server/issues/50431
+ */
+ public function testNoMetadata() {
+ $this->assertNull($this->instance->getMetaData('/test/null'));
+ }
+
}