From 8c21f2b19c0905c8732de98750c20d028acdd1c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Mon, 25 Aug 2025 11:51:58 +0200 Subject: [PATCH 1/2] fix(encryption): Fix TypeError when trying to decrypt unencrypted file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- lib/private/Files/Storage/Wrapper/Encryption.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index 58bd4dfddcf..fb6cdf80c6c 100644 --- a/lib/private/Files/Storage/Wrapper/Encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php @@ -683,6 +683,8 @@ class Encryption extends Wrapper { } } } else { + $source = false; + $target = false; try { $source = $sourceStorage->fopen($sourceInternalPath, 'r'); $target = $this->fopen($targetInternalPath, 'w'); @@ -692,10 +694,10 @@ class Encryption extends Wrapper { [, $result] = Files::streamCopy($source, $target, true); } } finally { - if (isset($source) && $source !== false) { + if ($source !== false) { fclose($source); } - if (isset($target) && $target !== false) { + if ($target !== false) { fclose($target); } } From 07b046f762c702f42e2011972c39e8a5d1d4f6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Mon, 25 Aug 2025 12:38:41 +0200 Subject: [PATCH 2/2] fix(tests): Fix fopen in mock returning null which is not a valid return MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- tests/lib/Files/ViewTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index ad27c3f798c..e7ad9fcc304 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -1205,6 +1205,9 @@ class ViewTest extends \Test\TestCase { $storage2->method('writeStream') ->willThrowException(new GenericFileException('Failed to copy stream')); + $storage2->method('fopen') + ->willReturn(false); + $storage1->mkdir('sub'); $storage1->file_put_contents('foo.txt', '0123456789ABCDEFGH'); $storage1->mkdir('dirtomove');