Skip to content

Commit

Permalink
fix(Blurhash): Suppress imagecreatefromstring() E_WARNING
Browse files Browse the repository at this point in the history
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 <josh.t.richards@gmail.com>
  • Loading branch information
joshtrichards authored and backportbot[bot] committed Apr 8, 2024
1 parent bad51ef commit fc1a83f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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;
}
Expand Down

0 comments on commit fc1a83f

Please sign in to comment.