From 2dcadd2603da71e995e2fd1cec183772e6932521 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sun, 18 May 2025 16:48:56 +0200 Subject: [PATCH] fix(files_versions): only close stream if still open, fixing S3 Signed-off-by: Ferdinand Thiessen --- apps/files_versions/lib/Storage.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php index 4b58d721583..0fb3a0522f4 100644 --- a/apps/files_versions/lib/Storage.php +++ b/apps/files_versions/lib/Storage.php @@ -430,11 +430,17 @@ class Storage { } else { $target = $storage2->fopen($internalPath2, 'w'); $result = $target !== false; - if ($target !== false) { + if ($result) { [, $result] = Files::streamCopy($source, $target, true); + } + // explicit check as S3 library closes streams already + if (is_resource($target)) { fclose($target); } } + } + // explicit check as S3 library closes streams already + if (is_resource($source)) { fclose($source); }