summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2023-07-12 00:44:59 +0200
committerGitHub <noreply@github.com>2023-07-12 00:44:59 +0200
commit6715bbade1570191c0bbbfdd127e52ca110c7d37 (patch)
treef8a275baaf33426256f8497b60145fa9833f4609
parent2febf7ed885723bfa6e3d7f41ac2ad0a72f1c71b (diff)
parent168acfbc8a80a443f23a01200aec840ff6655f35 (diff)
downloadnextcloud-server-6715bbade1570191c0bbbfdd127e52ca110c7d37.tar.gz
nextcloud-server-6715bbade1570191c0bbbfdd127e52ca110c7d37.zip
Merge pull request #39101 from nextcloud/backport/39093/stable25
[stable25] Silent `imagecreatefromstring()` errors
-rw-r--r--lib/private/legacy/OC_Image.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
index 1e4afeef338..b7c7022904f 100644
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -755,7 +755,7 @@ class OC_Image implements \OCP\IImage {
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;