diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-08-19 15:48:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-19 15:48:01 +0300 |
| commit | f7d5bb5cb1469f1355442d6d7263d0f85cd8a05b (patch) | |
| tree | 47a68d1a47c09005725d50b9a5ecbad263847335 | |
| parent | cae51a0a25d6fffb81f11f33cd8452410961f1a2 (diff) | |
| parent | cb49f193850838a26e8097b26708bc19fb0fe06f (diff) | |
Merge pull request #28499 from nextcloud/backport/28485/stable22
| -rw-r--r-- | lib/private/legacy/OC_Image.php | 20 |
1 files changed, 14 insertions, 6 deletions
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']); } |