Fix Call to a member function getSize() on bool

getFileInfo might return false, handle this case by ignoring the result

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
pull/32008/head
Carl Schwan 2 years ago
parent 0824f440f0
commit 1c97611fa2

@ -145,21 +145,26 @@ class OC_Files {
}
self::lockFiles($view, $dir, $files);
$numberOfFiles = 0;
$fileSize = 0;
/* Calculate filesize and number of files */
if ($getType === self::ZIP_FILES) {
$fileInfos = [];
$fileSize = 0;
foreach ($files as $file) {
$fileInfo = \OC\Files\Filesystem::getFileInfo($dir . '/' . $file);
$fileSize += $fileInfo->getSize();
$fileInfos[] = $fileInfo;
if ($fileInfo) {
$fileSize += $fileInfo->getSize();
$fileInfos[] = $fileInfo;
}
}
$numberOfFiles = self::getNumberOfFiles($fileInfos);
} elseif ($getType === self::ZIP_DIR) {
$fileInfo = \OC\Files\Filesystem::getFileInfo($dir . '/' . $files);
$fileSize = $fileInfo->getSize();
$numberOfFiles = self::getNumberOfFiles([$fileInfo]);
if ($fileInfo) {
$fileSize = $fileInfo->getSize();
$numberOfFiles = self::getNumberOfFiles([$fileInfo]);
}
}
$streamer = new Streamer(\OC::$server->getRequest(), $fileSize, $numberOfFiles);

Loading…
Cancel
Save