From 94eb77a535bde17ee3b7c1819c80c686c763b804 Mon Sep 17 00:00:00 2001
From: Samuel CHEMLA <chemla.samuel@gmail.com>
Date: Sun, 1 Sep 2019 22:13:25 +0200
Subject: [PATCH] Fix sanity checks #16963
Signed-off-by: Samuel CHEMLA <chemla.samuel@gmail.com>
---
lib/private/legacy/image.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/lib/private/legacy/image.php b/lib/private/legacy/image.php
index d9af45f2226..2efde2ee688 100644
--- a/lib/private/legacy/image.php
+++ b/lib/private/legacy/image.php
@@ -878,10 +878,8 @@ class OC_Image implements \OCP\IImage {
$widthOrig = imagesx($this->resource);
$heightOrig = imagesy($this->resource);
$process = imagecreatetruecolor($width, $height);
-
- if ($process == false) {
+ if ($process === false) {
$this->logger->error(__METHOD__ . '(): Error creating true color image', array('app' => 'core'));
- imagedestroy($process);
return false;
}
@@ -892,8 +890,8 @@ class OC_Image implements \OCP\IImage {
imagesavealpha($process, true);
}
- imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
- if ($process == false) {
+ $res = imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
+ if ($res === false) {
$this->logger->error(__METHOD__ . '(): Error re-sampling process image', array('app' => 'core'));
imagedestroy($process);
return false;
--
GitLab