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

Limit the size of Exif data.

This commit is contained in:
KAMADA Ken'ichi 2020-01-26 19:19:50 +09:00
parent d6746c4004
commit 904f4b577e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/isobmff.rs
View File

@ -37,6 +37,8 @@ use crate::util::read64;
// Same for "msf1" [ISO23008-12 B.4.2] [ISO23008-12 B.4.4].
static HEIF_BRANDS: &[[u8; 4]] = &[*b"mif1", *b"msf1"];
const MAX_EXIF_SIZE: usize = 65535;
// Most errors in this file are Error::InvalidFormat.
impl From<&'static str> for Error {
fn from(err: &'static str) -> Error {
@ -222,6 +224,9 @@ impl<R> Parser<R> where R: io::BufRead + io::Seek {
return Err(io::Error::new(io::ErrorKind::UnexpectedEof,
"truncated extent").into());
}
if buf.len() > MAX_EXIF_SIZE {
return Err("Exif data too large".into());
}
}
},
1 => {
@ -236,6 +241,9 @@ impl<R> Parser<R> where R: io::BufRead + io::Seek {
0 => idat.get(off..),
_ => idat.get(off..end),
}.ok_or("Out of ItemDataBox")?);
if buf.len() > MAX_EXIF_SIZE {
return Err("Exif data too large".into());
}
}
},
2 => return Err(Error::NotSupported(