Merge pull request #46342 from nextcloud/fix-getimagesize

nextcloud · Jul 16, 2024 · d237fd0 · d237fd0
2 parents 1f8999e + c0e1503
commit d237fd0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
@@ -569,7 +569,7 @@ private function checkImageMemory($width, $height) {
 	private function checkImageSize($path) {
 		$size = @getimagesize($path);
 		if (!$size) {
-			return true;
+			return false;
 		}
 
 		$width = $size[0];
@@ -590,7 +590,7 @@ private function checkImageSize($path) {
 	private function checkImageDataSize($data) {
 		$size = @getimagesizefromstring($data);
 		if (!$size) {
-			return true;
+			return false;
 		}
 
 		$width = $size[0];
@@ -637,7 +637,7 @@ public function loadFromFile($imagePath = false) {
 					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']);