From e02a06072b12fa07f19d6cd746188bfeb8bd8685 Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 6 Apr 2024 10:41:46 -0400 Subject: [PATCH] fix(Blurhash): Suppress imagecreatefromstring() E_WARNING We're already checking return value to determine if the format is unrecognized. There's no reason to let imagecreatefromstring() generate it's own E_WARNING when the format is unrecognized. Fixes #44702 Signed-off-by: Josh --- lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php index b57dfa317e484..4c1a966670b45 100644 --- a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php +++ b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php @@ -88,7 +88,7 @@ public function handle(Event $event): void { try { // using preview image to generate the blurhash $preview = $this->preview->getPreview($file, 256, 256); - $image = imagecreatefromstring($preview->getContent()); + $image = @imagecreatefromstring($preview->getContent()); } catch (NotFoundException $e) { // https://github.com/nextcloud/server/blob/9d70fd3e64b60a316a03fb2b237891380c310c58/lib/private/legacy/OC_Image.php#L668 // The preview system can fail on huge picture, in that case we use our own image resizer. @@ -114,7 +114,7 @@ public function handle(Event $event): void { * @throws LockedException */ private function resizedImageFromFile(File $file): GdImage|false { - $image = imagecreatefromstring($file->getContent()); + $image = @imagecreatefromstring($file->getContent()); if ($image === false) { return false; }