Skip to content

[stable22] explicitly close source stream on local / encryption storage #29133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 2 commits into from
Oct 11, 2021
Merged

[stable22] explicitly close source stream on local / encryption storage #29133

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ce2a32
explicitly close source stream on local storage
kesselb Sep 20, 2021
15417f3
explicitly close source stream on encryption storage
kesselb Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
explicitly close source stream on encryption storage 
Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb @backportbot
kesselb authored and backportbot[bot] committed Oct 8, 2021
commit 15417f38247ae69579e6e95c98a7d741808655b8
5 changes: 3 additions & 2 deletions lib/private/Files/Storage/Wrapper/Encryption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,10 +926,10 @@ protected function getHeader($path) {
}

$result = [];

// first check if it is an encrypted file at all
// We would do query to filecache only if we know that entry in filecache exists

$info = $this->getCache()->get($path);
if (isset($info['encrypted']) && $info['encrypted'] === true) {
$firstBlock = $this->readFirstBlock($path);
Expand Down Expand Up @@ -1033,6 +1033,7 @@ public function writeStream(string $path, $stream, int $size = null): int {
// always fall back to fopen
$target = $this->fopen($path, 'w');
[$count, $result] = \OC_Helper::streamCopy($stream, $target);
fclose($stream);
fclose($target);
return $count;
}
Expand Down