tests/data/out-of-range.exif @@ -492,7 +492,8 @@ module EXIFR if len && pack && @type != 7 start = len > 4 ? @offset : (pos + 8) - @value = [pack[data[start..(start + len - 1)]]].flatten + d = data[start..(start + len - 1)] + @value = d && [pack[d]].flatten end end end @@ -521,7 +522,7 @@ module EXIFR read_for(pos) end - @buffer[(pos.begin - @pos)..(pos.end - @pos)] + @buffer && @buffer[(pos.begin - @pos)..(pos.end - @pos)] end def readshort(pos) lib/tiff.rb @@ -91,7 +91,7 @@ class TIFFTest < Test::Unit::TestCase assert_equal [678886.quo(100000), 0.quo(1), 0.quo(1)], t.gps_longitude assert_equal 'WGS84', t.gps_map_datum - (all_test_exifs - [f('gps.exif'), f('user-comment.exif')]).each do |fname| + (all_test_exifs - %w(gps user-comment out-of-range).map{|v| f("#{v}.exif")}).each do |fname| assert_nil TIFF.new(fname).gps_version_id end end @@ -166,4 +166,10 @@ class TIFFTest < Test::Unit::TestCase def test_user_comment assert_equal "Manassas Battlefield", TIFF.new(f('user-comment.exif')).user_comment end + + def test_handle_out_of_range_offset + assert_nothing_raised do + assert 'NIKON', TIFF.new(f('out-of-range.exif')).make + end + end end tests/tiff_test.rb 127c5b1c3fca359aa6480afc32b3ec9ccddac68c Remco van 't Veer rwvtveer@xs4all.nl http://github.com/remvee/exifr/commit/7153cb86c1d60e20ca14372bd1507096c1a7e99d 7153cb86c1d60e20ca14372bd1507096c1a7e99d 2009-11-10T12:15:39-08:00 2009-11-10T12:15:39-08:00 GH issue #2 "Nil pointer in tiff.rb" Handle bad IFD record with offset out of range 79bd5248aa05e6777fe989a538ef24fa411d5058 Remco van 't Veer rwvtveer@xs4all.nl