diff --git a/crates/raw/src/dng_metadata.rs b/crates/raw/src/dng_metadata.rs index 4b1dda130..6d8e6d958 100644 --- a/crates/raw/src/dng_metadata.rs +++ b/crates/raw/src/dng_metadata.rs @@ -135,10 +135,11 @@ impl Metadata<'_, '_> { }; let linearization = match self.raw_tag(tags::LINEARIZATION_TABLE) { Some(e) => { - let v = self.tiff.uints(e)?; - if v.len() > 65_536 { + // checked before `uints` allocates a u64 per entry + if e.count > 65_536 { return Err(Error::Malformed("LinearizationTable longer than 65536")); } + let v = self.tiff.uints(e)?; Some(v.into_iter().map(|x| x.min(65_535) as u16).collect()) } None => None, diff --git a/crates/raw/tests/it/dng_metadata.rs b/crates/raw/tests/it/dng_metadata.rs index 5cf75ae2a..2aa0e6d80 100644 --- a/crates/raw/tests/it/dng_metadata.rs +++ b/crates/raw/tests/it/dng_metadata.rs @@ -48,6 +48,11 @@ fn processing_tags_are_read_from_the_raw_ifd() { // base_ifd writes CFAPattern 1 0 2 1 (GRBG) assert_eq!(p.cfa, Some(Pattern { rows: 2, cols: 2, colors: vec![1, 0, 2, 1] })); } + // a LinearizationTable longer than 65536 entries is refused + let long = cfa_raw(|r| { + r.set(ct::LINEARIZATION_TABLE, Value::Short(vec![1; 65_537])); + }); + assert!(matches!(with_metadata(&dng(long, ByteOrder::Little), |m| m.params()), Err(Error::Malformed(_)))); // absent tags take the DNG defaults let p = with_metadata(&dng(cfa_raw(|_| {}), ByteOrder::Little), |m| m.params().unwrap()); assert_eq!((p.active_area, p.linearization, p.black_repeat), (None, None, (1, 1)));