fix(previews): Stop returning true when getimagesize() fails

Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
nextcloud · Jul 6, 2024 · 71c1e63 · 71c1e63
1 parent ca50c31
commit 71c1e63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/3rdparty b/3rdparty
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']);
+1 −0		composer.json
+5 −5		composer.lock
+2 −2		composer/installed.php