aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerdinand Thiessen <opensource@fthiessen.de>2025-05-18 16:48:56 +0200
committerFerdinand Thiessen <opensource@fthiessen.de>2025-05-18 16:48:56 +0200
commit2dcadd2603da71e995e2fd1cec183772e6932521 (patch)
treeb7cd26ef2f1451877ef4cd4d1cf9dc609551558e
parentb9983cbd42366811ea6a149d10ccea3d0656405f (diff)
downloadnextcloud-server-fix/s3-versions.tar.gz
nextcloud-server-fix/s3-versions.zip
fix(files_versions): only close stream if still open, fixing S3fix/s3-versions
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
-rw-r--r--apps/files_versions/lib/Storage.php8
1 files changed, 7 insertions, 1 deletions
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);
}