Merge pull request #39101 from nextcloud/backport/39093/stable25

blizzz · web-flow · commit 6715bbade157 · 2023-07-12T00:44:59.000+02:00
[stable25] Silent `imagecreatefromstring()` errors
diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
@@ -755,7 +755,7 @@ public function loadFromFile($imagePath = false) {
 				if (!$this->checkImageDataSize($data)) {
 					return false;
 				}
-				$this->resource = imagecreatefromstring($data);
+				$this->resource = @imagecreatefromstring($data);
 				$iType = IMAGETYPE_PNG;
 				$this->logger->debug('OC_Image->loadFromFile, Default', ['app' => 'core']);
 				break;

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ public function loadFromFile($imagePath = false) {`
`755`	`755`	`if (!$this->checkImageDataSize($data)) {`
`756`	`756`	`return false;`
`757`	`757`	`}`
`758`		`- $this->resource = imagecreatefromstring($data);`
	`758`	`+ $this->resource = @imagecreatefromstring($data);`
`759`	`759`	`$iType = IMAGETYPE_PNG;`
`760`	`760`	`$this->logger->debug('OC_Image->loadFromFile, Default', ['app' => 'core']);`
`761`	`761`	`break;`