sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46342 from nextcloud/fix-getimagesize

pull/46573/head
John Molakvoæ 2024-07-16 21:47:35 +07:00 committed by GitHub
parent 1f8999ea71 c0e1503ce1
commit d237fd0e78
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
Unescape Escape View File

@ -569,7 +569,7 @@ class OC_Image implements \OCP\IImage {
private function checkImageSize($path) {
$size = @getimagesize($path);
if (!$size) {
return true;
return false;
}
$width = $size[0];
@ -590,7 +590,7 @@ class OC_Image implements \OCP\IImage {
private function checkImageDataSize($data) {
$size = @getimagesizefromstring($data);
if (!$size) {
return true;
return false;
}
$width = $size[0];
@ -637,7 +637,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']);