From 09e82999cb48744b30fcad68d172881447b1d899 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 5 Feb 2019 11:28:30 -0500 Subject: [PATCH] Update script to check for error from Imagick use try catch to catch errors that are thrown. --- models/admin/ajax/imageUpload.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/models/admin/ajax/imageUpload.php b/models/admin/ajax/imageUpload.php index 5dc1a63f..7e365346 100644 --- a/models/admin/ajax/imageUpload.php +++ b/models/admin/ajax/imageUpload.php @@ -320,10 +320,14 @@ class GlmMembersAdmin_ajax_imageUpload extends GlmDataImages public function stripImageMeta($imageName) { if (extension_loaded('imagick')) { - $imagick = new Imagick($imageName); - $imagick->setCompressionQuality(100); - $imagick->stripImage(); - $imagick->writeImage($imageName); + try { + $imagick = new Imagick($imageName); + $imagick->setCompressionQuality(100); + $imagick->stripImage(); + $imagick->writeImage($imageName); + } catch ( ImagickException $e ) { + return $imageName; + } } else if (extension_loaded('gd') && function_exists('gd_info')) { $image_type = exif_imagetype($imageName); $newImageQuality = 100; -- 2.17.1