upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-14 19:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #46569 from nextcloud/backport/46342/stable29

Browse source 
[stable29] fix(previews): Stop returning true when `getimagesize()` fails
This commit is contained in:
Josh 2024-07-19 22:23:02 -04:00 committed by GitHub
commit ec016b0a64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/legacy/OC_Image.php
View file

@ -626,7 +626,7 @@ class OC_Image implements \OCP\IImage {
private function checkImageSize($path) {
$size = @getimagesize($path);
if (!$size) {
return true;
return false;
}
$width = $size[0];
@ -647,7 +647,7 @@ class OC_Image implements \OCP\IImage {
private function checkImageDataSize($data) {
$size = @getimagesizefromstring($data);
if (!$size) {
return true;
return false;
}
$width = $size[0];
@ -694,7 +694,7 @@ class OC_Image implements \OCP\IImage {
if (!$this->checkImageSize($imagePath)) {
return false;
}
if (getimagesize($imagePath) !== false) {
if (@getimagesize($imagePath) !== false) {
$this->resource = @imagecreatefromjpeg($imagePath);
} else {
$this->logger->debug('OC_Image->loadFromFile, JPG image not valid: ' . $imagePath, ['app' => 'core']);