michael/exif-rs
michael
/
exif-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not treat IFD2 and beyond as an error; just ignore them.

This commit is contained in:
KAMADA Ken'ichi 2018-06-17 21:34:56 +09:00
parent bbca6ea229
commit 8b06acb3dd
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tiff.rs
View File

@ -135,10 +135,11 @@ fn parse_ifd<'a, E>(fields: &mut Vec<Field<'a>>, data: &'a [u8],
return Err(Error::InvalidFormat("Truncated next IFD offset"));
}
let next_ifd_offset = E::loadu32(data, offset + 2 + count * 12) as usize;
if next_ifd_offset == 0 {
// Ignore IFDs after IFD1 (thumbnail) for now.
if next_ifd_offset == 0 || thumbnail {
return Ok(());
}
if ctx != Context::Tiff || thumbnail {
if ctx != Context::Tiff {
return Err(Error::InvalidFormat("Unexpected next IFD"));
}
parse_ifd::<E>(fields, data, next_ifd_offset, Context::Tiff, true)
@ -273,8 +274,10 @@ mod tests {
fn inf_loop_by_next() {
let data = b"MM\0\x2a\0\0\0\x08\
\0\x01\x01\0\0\x03\0\0\0\x01\0\x14\0\0\0\0\0\x08";
assert_err_pat!(parse_exif(data),
Error::InvalidFormat("Unexpected next IFD"));
// assert_err_pat!(parse_exif(data),
// Error::InvalidFormat("Unexpected next IFD"));
let (v, _) = parse_exif(data).unwrap();
assert_eq!(v.len(), 2);
}
#[test]