Skip to content

Commit d0383dd

Browse files
committed
explicitly close source stream on local storage
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
1 parent dbf7905 commit d0383dd

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

lib/private/Files/Storage/Local.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,6 +568,9 @@ public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
568568

569569
public function writeStream(string $path, $stream, int $size = null): int {
570570
$result = $this->file_put_contents($path, $stream);
571+
if (is_resource($stream)) {
572+
fclose($stream);
573+
}
571574
if ($result === false) {
572575
throw new GenericFileException("Failed write steam to $path");
573576
} else {

tests/lib/Files/Storage/Storage.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,7 @@ public function testWriteStream() {
658658

659659
$storage->writeStream('test.txt', $source);
660660
$this->assertTrue($storage->file_exists('test.txt'));
661-
$this->assertEquals(file_get_contents($textFile), $storage->file_get_contents('test.txt'));
661+
$this->assertStringEqualsFile($textFile, $storage->file_get_contents('test.txt'));
662+
$this->assertEquals('resource (closed)', gettype($source));
662663
}
663664
}

0 commit comments

Comments
 (0)