lib/tiff.rb in exifr-0.10.8 vs lib/tiff.rb in exifr-0.10.9

@@ -490,11 +490,12 @@
           end
         end
 
         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
 
     class Data #:nodoc:
@@ -519,10 +520,10 @@
 
         if pos.begin < @pos || pos.end >= @pos + @buffer.size
           read_for(pos)
         end
 
-        @buffer[(pos.begin - @pos)..(pos.end - @pos)]
+        @buffer && @buffer[(pos.begin - @pos)..(pos.end - @pos)]
       end
 
       def readshort(pos)
         self[pos..(pos + 1)].unpack(@short)[0]
       end