[Analyzer] Ensure tempfile is always closed

igorkasyanchuk · Nov 25, 2024 · 77491c6 · 77491c6
1 parent 0ef64e4
commit 77491c6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/lib/active_storage_validations/analyzer/image_analyzer/image_magick.rb b/lib/active_storage_validations/analyzer/image_analyzer/image_magick.rb
@@ -17,11 +17,15 @@ def read_image
       end
 
       Tempfile.create(binmode: true) do |tempfile|
-        if image(tempfile).valid?
-          yield image(tempfile)
-        else
-          logger.info "Skipping image analysis because ImageMagick doesn't support the file"
-          {}
+        begin
+          if image(tempfile).valid?
+            yield image(tempfile)
+          else
+            logger.info "Skipping image analysis because ImageMagick doesn't support the file"
+            {}
+          end
+        ensure
+          tempfile.close
         end
       end
     rescue MiniMagick::Error => error

diff --git a/lib/active_storage_validations/analyzer/image_analyzer/vips.rb b/lib/active_storage_validations/analyzer/image_analyzer/vips.rb
@@ -16,11 +16,15 @@ def read_image
       end
 
       Tempfile.create(binmode: true) do |tempfile|
-        if image(tempfile)
-          yield image(tempfile)
-        else
-          logger.info "Skipping image analysis because Vips doesn't support the file"
-          {}
+        begin
+          if image(tempfile)
+            yield image(tempfile)
+          else
+            logger.info "Skipping image analysis because Vips doesn't support the file"
+            {}
+          end
+        ensure
+          tempfile.close
         end
       end
     rescue ::Vips::Error => error