DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Fix slice panics in the PDF post-passes on malformed page trees and metadata (#1591)
MarekSpodBiedryce486fda63d6
diff --git a/crates/pdf/src/forms.rs b/crates/pdf/src/forms.rsindex 39aa597ec..07f4cf04c 100644--- a/crates/pdf/src/forms.rs+++ b/crates/pdf/src/forms.rs@@ -8,7 +8,7 @@ use std::fmt::Write as _;use designcraft_doc::{Document, FieldKind, FormField, Item, MediaOptions};use crate::export::Sheet;-use crate::transitions::{int_after, object, rfind};+use crate::transitions::{bracketed, int_after, object, rfind};/// A field placed on an output page: (page index, PDF rectangle, field).pub(crate) type Placed = (usize, [f64; 4], FormField);@@ -94,7 +94,7 @@ pub(crate) fn add_fields(pdf: &[u8], fields: &[Placed], media: &[PlacedMedia]) -let pages_id = int_after(&cat, "/Pages")?;let pages = String::from_utf8_lossy(&pdf[object(pdf, pages_id)?]).to_string();let kids_str = &pages[pages.find("/Kids")? + 5..];- let kids_str = &kids_str[kids_str.find('[')? + 1..kids_str.find(']')?];+ let kids_str = bracketed(kids_str)?;let nums: Vec<usize> = kids_str.split_whitespace().filter_map(|t| t.parse().ok()).collect();let kids: Vec<usize> = nums.chunks(2).map(|c| c[0]).collect();diff --git a/crates/pdf/src/pdfx.rs b/crates/pdf/src/pdfx.rsindex 534886f1d..74c385e73 100644--- a/crates/pdf/src/pdfx.rs+++ b/crates/pdf/src/pdfx.rs@@ -94,7 +94,7 @@ pub fn make_pdfx4(pdf: &[u8], title: &str, date: Option<i64>) -> Option<Vec<u8>>let s0 = find(body, b"stream", 0)? + b"stream".len();let s0 = s0 + body[s0..].iter().take_while(|c| **c == b'\r' || **c == b'\n').count();let s1 = rfind(body, b"endstream")?;- let xml = String::from_utf8_lossy(&body[s0..s1]).trim_end().to_string();+ let xml = String::from_utf8_lossy(body.get(s0..s1)?).trim_end().to_string();let dict = String::from_utf8_lossy(&body[..find(body, b"stream", 0)?]).to_string();if dict.contains("/Filter") {return None;@@ -668,6 +668,18 @@ mod tests {out}+ /// A metadata object whose only `stream` is the one inside `endstream` is refused, not a slice panic.+ #[test]+ fn metadata_with_only_endstream_does_not_panic() {+ let objects = ["<</Type/Catalog/Pages 2 0 R/Metadata 3 0 R>>", "<</Type/Pages/Kids[]/Count 0>>", "<</Type/Metadata>>endstream"];+ let mut out = b"%PDF-1.6\n".to_vec();+ for (i, o) in objects.iter().enumerate() {+ out.extend_from_slice(format!("{} 0 obj\n{o}\nendobj\n", i + 1).as_bytes());+ }+ out.extend_from_slice(b"trailer\n<</Size 4/Root 1 0 R>>\nstartxref\n0\n%%EOF\n");+ assert!(super::make_pdfx4(&out, "t", None).is_none());+ }+/// DeviceRGB is allowed when a `DefaultRGB` colour space makes it colour-managed.#[test]fn default_rgb_makes_device_rgb_managed() {diff --git a/crates/pdf/src/transitions.rs b/crates/pdf/src/transitions.rsindex cbfbe27cc..d37581afd 100644--- a/crates/pdf/src/transitions.rs+++ b/crates/pdf/src/transitions.rs@@ -43,6 +43,14 @@ pub(crate) fn int_after(s: &str, key: &str) -> Option<usize> {rest[..end].parse().ok()}+/// The text between the first `[` and the first `]` after it. `None` when there is no such pair (a `]`+/// before the `[` included).+pub(crate) fn bracketed(s: &str) -> Option<&str> {+ let open = s.find('[')?;+ let close = s[open..].find(']')? + open;+ s.get(open + 1..close)+}+/// Byte range of object `id`'s body (between `obj` and `endobj`).pub(crate) fn object(pdf: &[u8], id: usize) -> Option<std::ops::Range<usize>> {// The latest copy (incremental updates re-state objects further on).@@ -132,7 +140,7 @@ pub fn add_page_entries(pdf: &[u8], extra: &[Option<String>]) -> Option<Vec<u8>>let pages = String::from_utf8_lossy(&pdf[object(pdf, pages_id)?]).to_string();let kids_at = pages.find("/Kids")?;let kids_str = &pages[kids_at + 5..];- let kids_str = &kids_str[kids_str.find('[')? + 1..kids_str.find(']')?];+ let kids_str = bracketed(kids_str)?;let nums: Vec<usize> = kids_str.split_whitespace().filter_map(|t| t.parse().ok()).collect();let kids: Vec<usize> = nums.chunks(2).map(|c| c[0]).collect();let starts = object_starts(pdf, extra.iter().zip(&kids).filter_map(|(t, &kid)| t.as_ref().map(|_| kid)));@@ -199,6 +207,31 @@ pub fn add_catalog_entries(pdf: &[u8], entries: &str) -> Option<Vec<u8>> {Some(out)}+#[cfg(test)]+mod bracket_tests {+ use super::{add_page_entries, bracketed};++ #[test]+ fn bracketed_ignores_a_close_before_the_open() {+ assert_eq!(bracketed(" [3 0 R 4 0 R] "), Some("3 0 R 4 0 R"));+ assert_eq!(bracketed("] ["), None);+ assert_eq!(bracketed("] [3 0 R]"), Some("3 0 R"));+ assert_eq!(bracketed("[]"), Some(""));+ }++ /// `]` before the `[` of /Kids (a spoofed page tree) is refused, not a slice panic.+ #[test]+ fn kids_closed_before_opened_is_refused() {+ let objects = ["<</Type/Catalog/Pages 2 0 R>>", "<</Type/Pages/Kids ] [3 0 R/Count 1>>"];+ let mut out = b"%PDF-1.6\n".to_vec();+ for (i, o) in objects.iter().enumerate() {+ out.extend_from_slice(format!("{} 0 obj\n{o}\nendobj\n", i + 1).as_bytes());+ }+ out.extend_from_slice(b"trailer\n<</Size 3/Root 1 0 R>>\nstartxref\n0\n%%EOF\n");+ assert!(add_page_entries(&out, &[Some("/Rotate 0".to_string())]).is_none());+ }+}+#[cfg(test)]mod object_index_tests {use super::{MAX_INDEXED_PAGE_OBJECTS, object_starts};