local-fastimage_resize 3.3.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a7a5852a9c12e9eb1da31bc031d8b39556025aa14a3df7cd21e63c23fe022c0
-  data.tar.gz: d5cb5920f6434683f56bb828cfb6b4dcd1742ae28e6184fe7b9e559cd2a61947
+  metadata.gz: d4d043392b65693b4af9bca7adc247c1872443e906bf4c72e4e93a37da8b086e
+  data.tar.gz: e1f0da7471e86c33faf6c790a6eabda379c2c6b7bb1029958e8afa296575a08f
 SHA512:
-  metadata.gz: 6d60ea4c09f3901652548da85b723ea6b48959ec60a0633823e1b2a7a05a4318da716b36839d39bd2d9a7521eb3296e1eee459e9849df68c5359844d1c764d1d
-  data.tar.gz: 8f145aeae41f9e0cfb9aec8d56bc7b5a7b9beddec9d5d31496268434f247bd99dcd3a9c74c5e7a62b36d035dc3a78897faa232a90585fc886fa841d453a595fe
+  metadata.gz: 4af1768186b8a056a5b3cacae9a7d99e2795df3d734522418636fa085c0935f9310245e7c6107b0bafb09db63987eb8421ecc76f3ab14abb3ff7522c790603e6
+  data.tar.gz: a9a22b4b9c6639984209422ea73cb7dbcd13ddf408befb4edb95960226f3400d66cfef1e00c8f491ad44bc6f92ee9f938940fb33a10459893384d4f67dfd252d

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
+  - 3.0.0
 
 before_install:
   - gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 3.4.1 - 2025-03-04
+
+Improved error handling and memory management to fix segmentation faults that
+could occur with malformed images.
+
+Introduced a new `FastImage::Resize::ImageProcessingError` exception class
+
+# 3.4.0 - 2021-02-10
+
+Support for resizing TIFF images. Output of such an operation is always a PNG
+image.
+
 # 3.3.0 - 2018-04-24
 
 Support for Exif orientation.

data/ext/fastimage_native_resize/fastimage_native_resize.c

@@ -23,7 +23,9 @@ static VALUE fastimage_native_resize(
   int trans = 0, x = 0, y = 0, f = 0;
 
   in = fopen(filename_in, "rb");
-  if (!in) return Qnil;
+  if (!in) {
+    rb_raise(rb_eIOError, "Could not open input file: %s", filename_in);
+  }
 
   switch(image_type) {
     case 0: im_in = gdImageCreateFromJpeg(in);
@@ -31,49 +33,62 @@ static VALUE fastimage_native_resize(
     case 1: im_in = gdImageCreateFromPng(in);
             break;
     case 2: im_in = gdImageCreateFromGif(in);
-            trans = gdImageGetTransparent(im_in);
-            /* find a transparent pixel, then turn off transparency
-               so that it copies correctly */
-            if (trans >= 0) {
-              for (x=0; x<gdImageSX(im_in); x++) {
-                for (y=0; y<gdImageSY(im_in); y++) {
-                  if (gdImageGetPixel(im_in, x, y) == trans) {
-                    f = 1;
-                    break;
+            if (im_in) {
+              trans = gdImageGetTransparent(im_in);
+              /* find a transparent pixel, then turn off transparency
+                 so that it copies correctly */
+              if (trans >= 0) {
+                for (x=0; x<gdImageSX(im_in); x++) {
+                  for (y=0; y<gdImageSY(im_in); y++) {
+                    if (gdImageGetPixel(im_in, x, y) == trans) {
+                      f = 1;
+                      break;
+                    }
                   }
+                  if (f) break;
                 }
-                if (f) break;
+                gdImageColorTransparent(im_in, -1);
+                if (!f) trans = -1;  /* no transparent pixel found */
               }
-              gdImageColorTransparent(im_in, -1);
-              if (!f) trans = -1;  /* no transparent pixel found */
             }
             break;
+    case 3: im_in = gdImageCreateFromTiff(in);
+            break;
+    default:
+            fclose(in);
+            rb_raise(rb_eArgError, "Unsupported image type: %d", image_type);
   }
 
+  fclose(in);
   if (!im_in) {
-    fclose(in);
-    return Qnil;
+    rb_raise(rb_eRuntimeError, "Failed to read image data from: %s", filename_in);
   }
 
 
 
   /*  Handle orientation */
   if (orientation == 5 || orientation == 6) {
-    im_in = gdImageRotateInterpolated(im_in, 270.0, 0);
+    gdImagePtr rotated = gdImageRotateInterpolated(im_in, 270.0, 0);
+    gdImageDestroy(im_in);
+    if (!rotated) {
+      rb_raise(rb_eRuntimeError, "Failed to rotate image (orientation %d)", orientation);
+    }
+    im_in = rotated;
   }
   if (orientation == 7 || orientation == 8) {
-    im_in = gdImageRotateInterpolated(im_in, 90.0, 0);
-  }
-  if (!im_in) {
-    fclose(in);
-    return Qnil;
+    gdImagePtr rotated = gdImageRotateInterpolated(im_in, 90.0, 0);
+    gdImageDestroy(im_in);
+    if (!rotated) {
+      rb_raise(rb_eRuntimeError, "Failed to rotate image (orientation %d)", orientation);
+    }
+    im_in = rotated;
   }
 
   if (orientation == 2 || orientation == 5 || orientation == 7) {
     gdImageFlipHorizontal(im_in);
   }
   if (orientation == 3) {
-      gdImageFlipBoth(im_in);
+    gdImageFlipBoth(im_in);
   }
   if (orientation == 4) {
     gdImageFlipVertical(im_in);
@@ -98,15 +113,14 @@ static VALUE fastimage_native_resize(
 
 
   im_out = gdImageCreateTrueColor(w, h);  /* must be truecolor */
-  if (im_out) {
-    if (image_type == 1) {
-      gdImageAlphaBlending(im_out, 0);  /* handle transparency correctly */
-      gdImageSaveAlpha(im_out, 1);
-    }
-    fclose(in);
-  } else {
-    fclose(in);
-    return Qnil;
+  if (!im_out) {
+    gdImageDestroy(im_in);
+    rb_raise(rb_eRuntimeError, "Failed to create output image buffer");
+  }
+  
+  if (image_type == 1) {
+    gdImageAlphaBlending(im_out, 0);  /* handle transparency correctly */
+    gdImageSaveAlpha(im_out, 1);
   }
 
   /* Now copy the original */
@@ -115,7 +129,11 @@ static VALUE fastimage_native_resize(
     gdImageSX(im_in), gdImageSY(im_in));
 
   out = fopen(filename_out, "wb");
-  if (out) {
+  if (!out) {
+    gdImageDestroy(im_in);
+    gdImageDestroy(im_out);
+    rb_raise(rb_eIOError, "Could not open output file: %s", filename_out);
+  }
     switch(image_type) {
       case 0: gdImageJpeg(im_out, out, jpeg_quality);
               break;
@@ -128,9 +146,11 @@ static VALUE fastimage_native_resize(
               }
               gdImageGif(im_out, out);
               break;
+      case 3: gdImagePng(im_out, out);
+              break;
     }
     fclose(out);
-  }
+  
   gdImageDestroy(im_in);
   gdImageDestroy(im_out);
   return Qnil;

data/lib/fastimage/resize/version.rb

@@ -2,6 +2,6 @@
 
 class FastImage
   module Resize
-    VERSION = "3.3.0"
+    VERSION = "3.4.1"
   end
 end

data/lib/fastimage/resize.rb

@@ -26,11 +26,14 @@ require 'fastimage'
 require 'fastimage_native_resize'
 
 module FastImage::Resize
-  SUPPORTED_FORMATS = [:jpeg, :png, :gif]
-  FILE_EXTENSIONS = [:jpg, :png, :gif]  # prefer jpg to jpeg as an extension
+  SUPPORTED_FORMATS = [:jpeg, :png, :gif, :tiff]
+  FILE_EXTENSIONS = [:jpg, :png, :gif, :tiff]  # prefer jpg to jpeg as an extension
 
   class FormatNotSupported < FastImage::FastImageException # :nodoc:
   end
+  
+  class ImageProcessingError < FastImage::FastImageException # :nodoc:
+  end
 
   def self.included(base)
     base.extend ClassMethods
@@ -79,11 +82,11 @@ module FastImage::Resize
 
     FastImage.native_resize(path, file_out.to_s, width.to_i, height.to_i, type_index, jpeg_quality.to_i, orientation)
 
-    raise FastImage::ImageFetchFailure, 'Image could be created' unless File.exist?(file_out.to_s)
+    raise FastImage::ImageFetchFailure, 'Image could not be created' unless File.exist?(file_out.to_s)
 
     temp_file
   rescue RuntimeError => e
-    raise FastImage::ImageFetchFailure, e.message
+    raise FastImage::Resize::ImageProcessingError, e.message
   end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: local-fastimage_resize
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Stephen Sykes
 - Gregor Schmidt (Planio)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: local-fastimage
@@ -110,7 +110,7 @@ homepage: http://github.com/planio-gmbh/local-fastimage_resize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,9 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - libgd, see www.libgd.org
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.22
+signing_key:
 specification_version: 4
 summary: Local FastImage Resize - Image resizing fast and simple
 test_files: []