mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20361 from nextcloud/write-stream-close-on-exception 

Close the streams in `writeStream` even when there is an exception
This commit is contained in:
Christoph Wurst 2020-04-15 10:48:24 +02:00 committed by GitHub
parent d63abebc93 ccbf3059ba
commit 301327135c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/Files/Storage/Common.php
View File

@ -859,9 +859,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;
}
}