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

Merge pull request #8030 from nextcloud/7986_12 

[stable13] If the preview is size 0 it is invalid
This commit is contained in:
Morris Jobke 2018-01-24 16:40:44 +01:00 committed by GitHub
parent 1a21524f6f f259e1cb8c
commit a0f62b71c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/private/Preview/Generator.php
View File

@ -110,6 +110,11 @@ class Generator {
// Get the max preview and infer the max preview sizes from that // Get the max preview and infer the max preview sizes from that
$maxPreview = $this->getMaxPreview($previewFolder, $file, $mimeType); $maxPreview = $this->getMaxPreview($previewFolder, $file, $mimeType);
if ($maxPreview->getSize() === 0) {
$maxPreview->delete();
throw new NotFoundException('Max preview size 0, invalid!');
}
list($maxWidth, $maxHeight) = $this->getPreviewSize($maxPreview); list($maxWidth, $maxHeight) = $this->getPreviewSize($maxPreview);
// If both width and heigth are -1 we just want the max preview // If both width and heigth are -1 we just want the max preview
@ -129,15 +134,20 @@ class Generator {
// Try to get a cached preview. Else generate (and store) one // Try to get a cached preview. Else generate (and store) one
try { try {
try { try {
$file = $this->getCachedPreview($previewFolder, $width, $height, $crop, $maxPreview->getMimeType()); $preview = $this->getCachedPreview($previewFolder, $width, $height, $crop, $maxPreview->getMimeType());
} catch (NotFoundException $e) { } catch (NotFoundException $e) {
$file = $this->generatePreview($previewFolder, $maxPreview, $width, $height, $crop, $maxWidth, $maxHeight); $preview = $this->generatePreview($previewFolder, $maxPreview, $width, $height, $crop, $maxWidth, $maxHeight);
} }
} catch (\InvalidArgumentException $e) { } catch (\InvalidArgumentException $e) {
throw new NotFoundException(); throw new NotFoundException();
} }
return $file; if ($preview->getSize() === 0) {
$preview->delete();
throw new NotFoundException('Cached preview size 0, invalid!');
}
return $preview;
} }
/** /**