sharpetronics/fastimage
1
0
Fork 0
mirror of https://github.com/sdsykes/fastimage.git synced 2025-10-09 00:02:49 -04:00
Code Issues Projects Releases Wiki Activity

Fixes infinite loop with certain jpegs, adds test. Fixes #19.

Browse Source
This commit is contained in:
Stephen Sykes 2013-09-17 18:25:47 +03:00
parent 6913762c93
commit 63b97f7ef0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/fastimage.rb
View File

@ -445,8 +445,9 @@ class FastImage
end end
next_offset = get_chars(4).unpack(@long)[0] next_offset = get_chars(4).unpack(@long)[0]
if next_offset > 0 relative_offset = next_offset - (@bytes_delivered - @exif_start_byte)
get_chars(next_offset - (@bytes_delivered - @exif_start_byte)) if relative_offset >= 0
get_chars(relative_offset)
parse_exif_ifd parse_exif_ifd
end end
end end

BIN
test/fixtures/infinite.jpg vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

3
test/test.rb
View File

@ -19,7 +19,8 @@ GoodFixtures = {
"test3.jpg"=>[:jpeg, [630, 367]], "test3.jpg"=>[:jpeg, [630, 367]],
"test.tiff"=>[:tiff, [85, 67]], "test.tiff"=>[:tiff, [85, 67]],
"test2.tiff"=>[:tiff, [333, 225]], "test2.tiff"=>[:tiff, [333, 225]],
"exif_orientation.jpg"=>[:jpeg, [2448, 3264]] "exif_orientation.jpg"=>[:jpeg, [2448, 3264]],
"infinite.jpg"=>[:jpeg, [160,240]]
} }
BadFixtures = [ BadFixtures = [