ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #682 from nextcloud/bugfix/621

Browse Source 
Only call fclose if resource is still available
This commit is contained in:
Julius Härtl
2018-11-09 12:40:07 +01:00
committed by GitHub
parent 733f17d59a aee5fb7a98
commit a8173b045d
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Service/FileService.php
View File

@@ -157,8 +157,13 @@ class FileService implements IAttachmentService {
$target = $folder->newFile($fileName); $target = $folder->newFile($fileName);
$content = fopen($file['tmp_name'], 'rb'); $content = fopen($file['tmp_name'], 'rb');
if ($content === false) {
throw new StatusException('Could not read file');
}
$target->putContent($content); $target->putContent($content);
if (is_resource($content)) {
fclose($content); fclose($content);
}
$attachment->setData($fileName); $attachment->setData($fileName);
} }
@@ -175,8 +180,13 @@ class FileService implements IAttachmentService {
$target = $this->getFileForAttachment($attachment); $target = $this->getFileForAttachment($attachment);
$content = fopen($file['tmp_name'], 'rb'); $content = fopen($file['tmp_name'], 'rb');
if ($content === false) {
throw new StatusException('Could not read file');
}
$target->putContent($content); $target->putContent($content);
if (is_resource($content)) {
fclose($content); fclose($content);
}
$attachment->setLastModified(time()); $attachment->setLastModified(time());
} }