From 165785e8cf43456816c8152ca4295640b21d1765 Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Thu, 30 May 2019 18:20:55 -0400
Subject: Skip image analysis on ImageMagick error

---
 activestorage/lib/active_storage/analyzer/image_analyzer.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'activestorage')

diff --git a/activestorage/lib/active_storage/analyzer/image_analyzer.rb b/activestorage/lib/active_storage/analyzer/image_analyzer.rb
index c8bc8fe953..bd1bef3076 100644
--- a/activestorage/lib/active_storage/analyzer/image_analyzer.rb
+++ b/activestorage/lib/active_storage/analyzer/image_analyzer.rb
@@ -43,6 +43,9 @@ module ActiveStorage
       rescue LoadError
         logger.info "Skipping image analysis because the mini_magick gem isn't installed"
         {}
+      rescue MiniMagick::Error => error
+        logger.error "Skipping image analysis due to an ImageMagick error: #{error.message}"
+        {}
       end
 
       def rotated_image?(image)
-- 
cgit v1.2.3