exifr 0.10.5 → 0.10.6

data/CHANGELOG

@@ -1,3 +1,6 @@
+EXIF Reader 0.10.6
+* bug fix (thanks to Forian Munz for reporting it); endless loop when reading a malformed EXIF/TIFF
+
 EXIF Reader 0.10.5
 * bug fix; "[#15421] duplicate orientation field behavior", first field (of any type) is leading now
 * Ruby 1.9 compatible

data/Rakefile

@@ -21,7 +21,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = 'exifr'
-  s.version = '0.10.5'
+  s.version = '0.10.6'
   s.author = "R.W. van 't Veer"
   s.email = 'remco@remvee.net'
   s.homepage = 'http://exifr.rubyforge.org/'

data/lib/tiff.rb

@@ -374,7 +374,7 @@ module EXIFR
       attr_reader :type, :fields
 
       def initialize(data, offset = nil, type = :image)
-        @data, @type, @fields = data, type, {}
+        @data, @offset, @type, @fields = data, offset, type, {}
         
         pos = offset || @data.readlong(4)
         num = @data.readshort(pos)
@@ -413,8 +413,12 @@ module EXIFR
         to_hash.inspect
       end
 
+      def next?
+        @offset_next != 0 && @offset_next < @data.size && (@offset || 0) < @offset_next
+      end
+      
       def next
-        IFD.new(@data, @offset_next) unless @offset_next == 0 || @offset_next >= @data.size
+        IFD.new(@data, @offset_next) if next?
       end
     
       def to_yaml_properties

data/tests/test_tiff.rb

@@ -53,7 +53,7 @@ class TestTIFF < Test::Unit::TestCase
   end
   
   def test_dates
-    (all_test_tiffs - [f('weird_date.exif'), f('plain.tif')]).each do |fname|
+    (all_test_tiffs - [f('weird_date.exif'), f('plain.tif'), f('endless-loop.exif')]).each do |fname|
       assert_kind_of Time, TIFF.new(fname).date_time
     end
     assert_nil TIFF.new(f('weird_date.exif')).date_time
@@ -152,4 +152,9 @@ class TestTIFF < Test::Unit::TestCase
     end
     assert count > 0, 'no thumbnails found'
   end
+  
+  def test_should_not_loop_endlessly
+    TIFF.new(f('endless-loop.exif'))
+    assert true
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors: 
 - R.W. van 't Veer
@@ -9,7 +9,7 @@ autorequire: exifr
 bindir: bin
 cert_chain: []
 
-date: 2007-12-28 00:00:00 +01:00
+date: 2008-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - tests/data/canon-g3.exif
 - tests/data/Canon_PowerShot_A85.exif
 - tests/data/Casio-EX-S20.exif
+- tests/data/endless-loop.exif
 - tests/data/exif.jpg
 - tests/data/FUJIFILM-FinePix_S3000.exif
 - tests/data/gps.exif