From: Simon Spannagel <simonspa@kth.se>
Date: Wed, 18 Aug 2021 05:36:11 +0000 (+0200)
Subject: Fix #20913: Check image resource before attempting to preserve alpha
X-Git-Tag: v23.0.0beta1~279^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F28485%2Fhead;p=nextcloud-server.git

Fix #20913: Check image resource before attempting to preserve alpha

Signed-off-by: Simon Spannagel <simonspa@kth.se>
---

diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
index 59d51773528..890df2241af 100644
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -562,9 +562,13 @@ class OC_Image implements \OCP\IImage {
 			case IMAGETYPE_GIF:
 				if (imagetypes() & IMG_GIF) {
 					$this->resource = imagecreatefromgif($imagePath);
-					// Preserve transparency
-					imagealphablending($this->resource, true);
-					imagesavealpha($this->resource, true);
+					if ($this->resource) {
+						// Preserve transparency
+						imagealphablending($this->resource, true);
+						imagesavealpha($this->resource, true);
+					} else {
+						$this->logger->debug('OC_Image->loadFromFile, GIF image not valid: ' . $imagePath, ['app' => 'core']);
+					}
 				} else {
 					$this->logger->debug('OC_Image->loadFromFile, GIF images not supported: ' . $imagePath, ['app' => 'core']);
 				}
@@ -583,9 +587,13 @@ class OC_Image implements \OCP\IImage {
 			case IMAGETYPE_PNG:
 				if (imagetypes() & IMG_PNG) {
 					$this->resource = @imagecreatefrompng($imagePath);
-					// Preserve transparency
-					imagealphablending($this->resource, true);
-					imagesavealpha($this->resource, true);
+					if ($this->resource) {
+						// Preserve transparency
+						imagealphablending($this->resource, true);
+						imagesavealpha($this->resource, true);
+					} else {
+						$this->logger->debug('OC_Image->loadFromFile, PNG image not valid: ' . $imagePath, ['app' => 'core']);
+					}
 				} else {
 					$this->logger->debug('OC_Image->loadFromFile, PNG images not supported: ' . $imagePath, ['app' => 'core']);
 				}