Catch Imagick errors
authorMichael <heluecht@pirati.ca>
Mon, 12 Apr 2021 12:37:11 +0000 (12:37 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 12 Apr 2021 12:37:11 +0000 (12:37 +0000)
See https://github.com/friendica/friendica/issues/9747#issuecomment-809675750

src/Object/Image.php

index 2ae4352..8592aff 100644 (file)
@@ -230,9 +230,13 @@ class Image
                }
 
                if ($this->isImagick()) {
-                       /* Clean it */
-                       $this->image = $this->image->deconstructImages();
-                       return $this->image;
+                       try {
+                               /* Clean it */
+                               $this->image = $this->image->deconstructImages();
+                               return $this->image;
+                       } catch (Exception $e) {
+                               return false;
+                       }
                }
                return $this->image;
        }
@@ -676,10 +680,14 @@ class Image
                }
 
                if ($this->isImagick()) {
-                       /* Clean it */
-                       $this->image = $this->image->deconstructImages();
-                       $string = $this->image->getImagesBlob();
-                       return $string;
+                       try {
+                               /* Clean it */
+                               $this->image = $this->image->deconstructImages();
+                               $string = $this->image->getImagesBlob();
+                               return $string;
+                       } catch (Exception $e) {
+                               return false;
+                       }
                }
 
                ob_start();