free-image 0.6.1 → 0.6.2

data/HISTORY

@@ -1,5 +1,10 @@
 = Release History
 
+== 0.6.2 / 2011-09-06 Charlie Savage
+
+* Add null pointer checks when loading images
+* Add null pointer check when creating a new image
+
 == 0.6.1 / 2011-09-06 Charlie Savage
 
 * Use release version on windows of FreeImage, not debug version.

data/free-image.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name        = 'free-image'
-  spec.version     = '0.6.1'
+  spec.version     = '0.6.2'
   spec.summary     = 'Ruby Bindings for the Free Image Library'
   spec.description = <<-EOS
     FreeImage is an Open Source library project for developers who would like to support

data/lib/free-image/bitmap.rb

@@ -98,6 +98,12 @@ module FreeImage
     end
 
     def self.new(ptr, source = nil)
+      # Ptr must be set
+      if ptr.null?
+        error = Error.new(:unknown, "Cannot create a bitmap from a null pointer")
+        raise(error)
+      end
+
       bitmap = super(ptr, source)
 
       if block_given?

data/lib/free-image/sources/abstract_source.rb

@@ -166,6 +166,13 @@ module FreeImage
       end
 
       ptr = load(format, flags)
+
+      # Make sure we didn't get a null pointer.  This can
+      # happen - see test_file for example#test_corrupt_wrong_format
+      if ptr.null?
+        error = Error.new(:unknown, "Could not load the image")
+        raise(error)
+      end
       Bitmap.new(ptr, self)
     end
   end

data/test/test_bitmap.rb

@@ -34,6 +34,14 @@ class BitmapTest < Test::Unit::TestCase
     end
   end
 
+  def test_new_from_nil
+    ptr = FFI::Pointer::NULL
+    error = assert_raise(FreeImage::Error) do
+      FreeImage::Bitmap.new(ptr)
+    end
+    assert_equal("Cannot create a bitmap from a null pointer", error.message)
+  end
+
   def test_clone
     image = lena_image
     clone = image.clone

data/test/test_file.rb

@@ -8,7 +8,7 @@ class FIFileTest < Test::Unit::TestCase
     path = image_path(image)
     FreeImage::File.new(path)
   end
-  
+
   def test_format
     assert_equal(:png, file.format)
   end
@@ -48,4 +48,23 @@ class FIFileTest < Test::Unit::TestCase
     tmp_file.close
     tmp_file.unlink
   end
+
+  def test_corrupt
+    path = image_path('corrupt.jpg')
+    file = FreeImage::File.new(path)
+    error = assert_raise(FreeImage::Error) do
+      file.open
+    end
+    assert_equal("Not a JPEG file: starts with 0xaa 0xc0", error.message)
+  end
+
+  def test_corrupt_wrong_format
+    path = image_path('corrupt.jpg')
+    file = FreeImage::File.new(path)
+    error = assert_raise(FreeImage::Error) do
+      # Be sneaky - say png!
+      file.open(:png)
+    end
+    assert_equal("Could not load the image", error.message)
+  end
 end

data/test/test_io.rb

@@ -50,4 +50,26 @@ class IoTest < Test::Unit::TestCase
     tmp_file.close
     tmp_file.unlink
   end
+
+  def test_corrupt
+    path = image_path('corrupt.jpg')
+    file = File.open(path)
+    io = FreeImage::IO.new(file)
+
+    error = assert_raise(FreeImage::Error) do
+      io.open
+    end
+    assert_equal("Cannot load :unknown image format", error.message)
+  end
+
+  def test_corrupt_wrong_format
+    path = image_path('corrupt.jpg')
+    file = File.open(path)
+    io = FreeImage::IO.new(file)
+
+    error = assert_raise(FreeImage::Error) do
+      io.open(:png)
+    end
+    assert_equal("Could not load the image", error.message)
+  end
 end

data/test/test_memory.rb

@@ -62,4 +62,24 @@ class MemoryTest < Test::Unit::TestCase
       assert_equal(dst.memory.bytes.encoding, Encoding::BINARY)
     end
   end
+
+  def test_corrupt
+    data = image_data('corrupt.jpg')
+    memory = FreeImage::Memory.new(data)
+    
+    error = assert_raise(FreeImage::Error) do
+      memory.open
+    end
+    assert_equal("Cannot load :unknown image format", error.message)
+  end
+
+  def test_corrupt_wrong_format
+    data = image_data('corrupt.jpg')
+    memory = FreeImage::Memory.new(data)
+
+    error = assert_raise(FreeImage::Error) do
+      memory.open(:png)
+    end
+    assert_equal("Could not load the image", error.message)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: free-image
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &24058800 !ruby/object:Gem::Requirement
+  requirement: &23576770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *24058800
+  version_requirements: *23576770
 - !ruby/object:Gem::Dependency
   name: hanna-nouveau
-  requirement: &24058512 !ruby/object:Gem::Requirement
+  requirement: &23576430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24058512
+  version_requirements: *23576430
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &24058212 !ruby/object:Gem::Requirement
+  requirement: &23575760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24058212
+  version_requirements: *23575760
 description: ! "    FreeImage is an Open Source library project for developers who
   would like to support\n    popular graphics image formats like PNG, BMP, JPEG, TIFF
   and others as needed by\n    today's multimedia applications. FreeImage is easy
@@ -91,6 +91,7 @@ files:
 - lib/free-image/types/rgb_triple.rb
 - lib/free-image.rb
 - test/cookbook.rb
+- test/images/corrupt.jpg
 - test/images/gradient.png
 - test/images/lena.png
 - test/images/lena.tiff