Close the streams in `writeStream` even when there is an exception

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index 8760fae1185f50bbb9e02fc4e1d5f06b2409876e..82ac49b9fdfb3fba8f1d196f02ea714099023847 100644 (file)
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -857,9 +857,12 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
                if (!$target) {
                        return 0;
                }
-               list($count, $result) = \OC_Helper::streamCopy($stream, $target);
-               fclose($stream);
-               fclose($target);
+               try {
+                       [$count, $result] = \OC_Helper::streamCopy($stream, $target);
+               } finally {
+                       fclose($target);
+                       fclose($stream);
+               }
                return $count;
        }
 }