exifr 0.10.8 → 0.10.9

data/CHANGELOG

@@ -1,3 +1,8 @@
+EXIF Reader 0.10.9
+* bug fix; "[GH#1] user_comment returns nil for jpeg with UserComment"; thanks to Mark Lundquist
+* bug fix; "[GH#2] Nil pointer in tiff.rb"
+* enhancement; "don't read entire files into memory"; thanks to Victor Bogado
+
 EXIF Reader 0.10.8
 * feature request; "[#23694] The object interface of JPEG is different from the TIFF one."
 

data/lib/tiff.rb

@@ -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)

data/tests/tiff_test.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: exifr
 version: !ruby/object:Gem::Version 
-  version: 0.10.8
+  version: 0.10.9
 platform: ruby
 authors: 
 - R.W. van 't Veer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 +02:00
+date: 2009-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,23 +29,25 @@ files:
 - lib/jpeg.rb
 - lib/tiff.rb
 - tests/data/1x1.jpg
-- tests/data/apple-aperture-1.5.exif
-- tests/data/canon-g3.exif
 - tests/data/Canon_PowerShot_A85.exif
 - tests/data/Casio-EX-S20.exif
+- tests/data/FUJIFILM-FinePix_S3000.exif
+- tests/data/Panasonic-DMC-LC33.exif
+- tests/data/Trust-DC3500_MINI.exif
+- tests/data/apple-aperture-1.5.exif
+- tests/data/canon-g3.exif
 - tests/data/endless-loop.exif
 - tests/data/exif.jpg
-- tests/data/FUJIFILM-FinePix_S3000.exif
 - tests/data/gps.exif
 - tests/data/image.jpg
 - tests/data/multiple-app1.jpg
 - tests/data/nikon_d1x.tif
-- tests/data/Panasonic-DMC-LC33.exif
+- tests/data/out-of-range.exif
 - tests/data/plain.tif
-- tests/data/Trust-DC3500_MINI.exif
+- tests/data/user-comment.exif
 - tests/data/weird_date.exif
-- tests/test_helper.rb
 - tests/jpeg_test.rb
+- tests/test_helper.rb
 - tests/tiff_test.rb
 - README.rdoc
 - CHANGELOG