EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
pdf: an inline image with absurd dimensions falls back to the EI scan
midasmatterhorn5e18a7fd9225
diff --git a/crates/pdf/src/image.rs b/crates/pdf/src/image.rsindex 5e6c49a54..69ff911e7 100644--- a/crates/pdf/src/image.rs+++ b/crates/pdf/src/image.rs@@ -82,7 +82,10 @@ pub(crate) fn inline_len(file: &File, d: &Dict, res: Option<&Dict>) -> Option<uslet mask = matches!(file.get(d, "ImageMask"), Some(Obj::Bool(true)));let bpc = if mask { 1 } else { file.get_num(d, "BitsPerComponent").unwrap_or(8.0) as usize };let n = if mask { 1 } else { file.get(d, "ColorSpace").map(|c| color_space(file, c, res).components()).unwrap_or(1) };- Some((w * n * bpc).div_ceil(8) * h)+ // `Width`/`Height` come straight from the file and can be enormous: fall back to the+ // `EI` scan (the caller's `None` branch) instead of overflowing the arithmetic.+ let row = w.checked_mul(n)?.checked_mul(bpc)?.div_ceil(8);+ Some(row.checked_mul(h)?)}/// Decode an image's samples (all filters, including DCT). Returns (bytes, components fromdiff --git a/crates/pdf/src/tests_import.rs b/crates/pdf/src/tests_import.rsindex add447e3a..3e7cd5702 100644--- a/crates/pdf/src/tests_import.rs+++ b/crates/pdf/src/tests_import.rs@@ -263,6 +263,21 @@ fn hostile_structures_return_errors_or_draw_nothing() {assert!(!doc.skipped.is_empty());}+#[test]+fn inline_image_with_absurd_dimensions_falls_back_to_ei_scan() {+ // `/W 5000000000000000000` overflows the row math (`* bpc` alone exceeds usize::MAX):+ // `inline_len` must return `None` (scan for `EI`) instead of overflowing; the oversized+ // image itself is then refused by size.+ let bytes = page_pdf(+ "q 10 0 0 10 0 0 cm BI /W 5000000000000000000 /H 100 /CS /G /BPC 8 ID \0 EI Q",+ "",+ vec![],+ );+ let doc = parse(&bytes).unwrap();+ let _ = render(&doc);+ assert!(!doc.skipped.is_empty());+}+#[test]fn truncated_and_corrupt_eps_never_panic() {let eps = b"%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 100 100\n\