From 465fa7478977bfe3c6d6a65cf72bfbbf324588c4 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sat, 14 Nov 2026 21:31:04 +0000 Subject: [PATCH] fix(metadata,raw,svg): address CodeRabbit review findings --- crates/metadata/src/cr3.rs | 26 +++++++++++++++----------- crates/raw/src/cr2.rs | 4 ++-- crates/raw/src/nef.rs | 2 +- crates/svg/src/tree.rs | 4 ++++ 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/crates/metadata/src/cr3.rs b/crates/metadata/src/cr3.rs index 630e16ba3..4ae189a80 100644 --- a/crates/metadata/src/cr3.rs +++ b/crates/metadata/src/cr3.rs @@ -390,18 +390,22 @@ fn trak(bytes: &[u8], t: &BoxRef, budget: &mut usize) -> Option { _ => None, } } - // Missing offset-table counts deny sample access, but the known + // Missing or truncated offset-table counts deny sample access, but the known // track must remain available to the largest-raw-track selector. - b"co64" => match be32(body, 4) { - Some(count) if count > 0 => offset = be64(body, 8).and_then(|v| usize::try_from(v).ok()), - None => offset = None, - _ => {} - }, - b"stco" => match be32(body, 4) { - Some(count) if count > 0 => offset = be32(body, 8).map(|v| v as usize), - None => offset = None, - _ => {} - }, + b"co64" => { + offset = match be32(body, 4) { + Some(count) if count > 0 && count as usize <= body.len().saturating_sub(8) / 8 => { + be64(body, 8).and_then(|v| usize::try_from(v).ok()) + } + _ => None, + }; + } + b"stco" => { + offset = match be32(body, 4) { + Some(count) if count > 0 && count as usize <= body.len().saturating_sub(8) / 4 => be32(body, 8).map(|v| v as usize), + _ => None, + }; + } _ => {} } } diff --git a/crates/raw/src/cr2.rs b/crates/raw/src/cr2.rs index 4cfdbf56e..7095a0bfa 100644 --- a/crates/raw/src/cr2.rs +++ b/crates/raw/src/cr2.rs @@ -99,9 +99,9 @@ fn measured_red_row(data: &[u16], width: usize, area: Rect, black: f32, white: f } let d = [diff[0] / n[0] as f64, diff[1] / n[1] as f64]; let rel = [0, 1].map(|p| (upper[p] - lower[p]).abs() / (upper[p] + lower[p]).max(1.0)); - if d[0] < 0.8 * d[1] && rel[0] < rel[1] { + if d[0] < 0.8 * d[1] && d[1] - d[0] > 4.0 && rel[0] < rel[1] { Some(1) - } else if d[1] < 0.8 * d[0] && rel[1] < rel[0] { + } else if d[1] < 0.8 * d[0] && d[0] - d[1] > 4.0 && rel[1] < rel[0] { Some(0) } else { None diff --git a/crates/raw/src/nef.rs b/crates/raw/src/nef.rs index 5d903b343..83c3e0b21 100644 --- a/crates/raw/src/nef.rs +++ b/crates/raw/src/nef.rs @@ -301,7 +301,7 @@ pub(crate) fn decode(bytes: &[u8], mode: Mode, limits: &Limits) -> Result (white, crate::LevelSource::Inferred), + (Some(white), _) => (white, crate::LevelSource::Fallback), (None, Mode::Full) => white_from_data_sourced(samples, bits), (None, Mode::Header) => (((1u32 << bits.clamp(1, 16)) - 1) as f32, crate::LevelSource::Fallback), }; diff --git a/crates/svg/src/tree.rs b/crates/svg/src/tree.rs index aa4ca7503..2f67edbda 100644 --- a/crates/svg/src/tree.rs +++ b/crates/svg/src/tree.rs @@ -480,6 +480,10 @@ fn embedded(used: &Used, limits: &Limits, data: &[u8], options: &usvg::Options<' used.svg_resource_limit.fetch_add(1, Ordering::Relaxed); return None; } + Err(Error::TooDeep(_)) => { + used.svg_limit.fetch_add(1, Ordering::Relaxed); + return None; + } Err(_) => { used.invalid_svg.fetch_add(1, Ordering::Relaxed); return None;