aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2023-07-10 18:32:15 +0200
committerGitHub <noreply@github.com>2023-07-10 18:32:15 +0200
commitf5a7d40621e09dec50d8c6f9253ae2b528ee2c1a (patch)
tree14a62345f4d9286e64a24bb4143af137e5158fe1 /lib
parentff86e8c411c8e2edfc648dcc68942a21f65cea7b (diff)
parentecbeacbdf54cb814c99186621f76ec7df7e92cfb (diff)
downloadnextcloud-server-f5a7d40621e09dec50d8c6f9253ae2b528ee2c1a.tar.gz
nextcloud-server-f5a7d40621e09dec50d8c6f9253ae2b528ee2c1a.zip
Merge pull request #39099 from nextcloud/backport/39093/stable27
[stable27] Silent `imagecreatefromstring()` errors
Diffstat (limited to 'lib')
-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 74e82e62b16..aac0c496734 100644
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -758,7 +758,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;