local-fastimage_resize 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc2a36cc1fec1aa2da1551e83951ddbfa9c2a0d3
-  data.tar.gz: 4a0fa8557d3a46e7531f4c7573c610e8e59ec8a4
+  metadata.gz: 50c371403135f3114a00aa4bc6c5f4b6dfb9b33c
+  data.tar.gz: a94a1d8ac982dfed7ac8f2c923f90361e105472c
 SHA512:
-  metadata.gz: 1d7e47f691cd3db8f1bf305f3ffc63a73b8795f3680c83d862216e0b89ba82f6727a7a653f4504402dd349c9d10df0780ffe2d404fc5ac08f8251392056c0186
-  data.tar.gz: e2c06d079a51c8f8d219da3df9de0de778470428a3155f5ff3918a54e2e5f55124944b1d84116c34745a1163413777273982b0bb24eeebfb0353427c6045e5c8
+  metadata.gz: 8f6caeb867b93b16d3ed126ca508cbc2ba020108f063ee8ce6dee6017e4b1dcc0a3f2e9224bd7f11e3c4647e0c1aa89ed22eb9d1c280e25ebe78a45ecb521331
+  data.tar.gz: 884d0de764ada380b77cd97841fc803eab00e52f9b3ad997f31cc20cc92fdf30737609bb8b94ed7adad16992ccf0091828e1b8f9730381cbb17bac9043c1f7d8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.2.0 - 2017-09-08
+
+Check for some error cases in gd calls which might have resulted in null-pointer exceptions and subsequent segfaults.
+
+If the resized image could not be created for any reason, we now raise a `FastImage::ImageFetchFailure` exception.
+
 # 3.1.1 - 2016-06-03
 
 Fix native code structure to work after gem install.

data/ext/fastimage_native_resize/fastimage_native_resize.c

@@ -46,7 +46,11 @@ static VALUE fastimage_native_resize(VALUE self, VALUE rb_in, VALUE rb_out, VALU
               if (!f) trans = -1;  /* no transparent pixel found */
             }
             break;
-    default: return Qnil;
+  }
+
+  if (!im_in) {
+    fclose(in);
+    return Qnil;
   }
 
   if (w == 0 || h == 0) {
@@ -60,14 +64,17 @@ static VALUE fastimage_native_resize(VALUE self, VALUE rb_in, VALUE rb_out, VALU
   }
 
   im_out = gdImageCreateTrueColor(w, h);  /* must be truecolor */
-
-  if (image_type == 1) {
-    gdImageAlphaBlending(im_out, 0);  /* handle transparency correctly */
-    gdImageSaveAlpha(im_out, 1);
+  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;
   }
 
-  fclose(in);
-
   /* Now copy the original */
   gdImageCopyResampled(im_out, im_in, 0, 0, 0, 0,
     gdImageSX(im_out), gdImageSY(im_out),

data/lib/fastimage/resize.rb

@@ -77,9 +77,11 @@ module FastImage::Resize
 
     FastImage.native_resize(path, file_out.to_s, width.to_i, height.to_i, type_index, jpeg_quality.to_i)
 
+    raise FastImage::ImageFetchFailure, 'Image could be created' unless File.exist?(file_out.to_s)
+
     temp_file
   rescue RuntimeError => e
-    raise ImageFetchFailure, e.message
+    raise FastImage::ImageFetchFailure, e.message
   end
 end
 

data/lib/fastimage/resize/version.rb

@@ -1,5 +1,5 @@
 class FastImage
   module Resize
-    VERSION = "3.1.1"
+    VERSION = "3.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local-fastimage_resize
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Stephen Sykes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: local-fastimage
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - libgd, see www.libgd.org
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Local FastImage Resize - Image resizing fast and simple