LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
LR-PRE-IMPORT: bound plist nesting (a hostile look can't overflow the stack)
Brandon Thomas4a70fcfe4faa
diff --git a/crates/engine/src/preset_luminar.rs b/crates/engine/src/preset_luminar.rsindex 0418f0bfe..e88304568 100644--- a/crates/engine/src/preset_luminar.rs+++ b/crates/engine/src/preset_luminar.rs@@ -65,8 +65,13 @@ impl Plist {struct Parser<'a> {s: &'a str,i: usize,+ /// Nesting of the element being read (bounded: a hostile file must not overflow the stack).+ depth: usize,}+/// Deepest `<dict>` / `<array>` nesting read (real looks nest a handful of levels).+const MAX_DEPTH: usize = 64;+fn unescape(t: &str) -> String {let mut out = String::with_capacity(t.len());let mut rest = t;@@ -165,6 +170,15 @@ impl Parser<'_> {Ok(unescape(&r[..end]))}fn value(&mut self) -> Result<Plist, String> {+ if self.depth >= MAX_DEPTH {+ return self.err("nested too deeply");+ }+ self.depth += 1;+ let v = self.value_inner();+ self.depth -= 1;+ v+ }+ fn value_inner(&mut self) -> Result<Plist, String> {let (name, closing, selfc) = self.tag()?;if closing {return self.err(&format!("unexpected </{name}>"));@@ -224,7 +238,7 @@ pub fn parse_plist(bytes: &[u8]) -> Result<Plist, String> {return Err("binary property lists are not supported".into());}let text = String::from_utf8_lossy(bytes);- let mut p = Parser { s: text.trim_start_matches('\u{feff}'), i: 0 };+ let mut p = Parser { s: text.trim_start_matches('\u{feff}'), i: 0, depth: 0 };p.value()}@@ -546,6 +560,14 @@ mod tests {assert!(parse_plist(b"bplist00\x01\x02").is_err());}+ #[test]+ fn hostile_nesting_is_an_error_not_a_crash() {+ let deep = format!("<plist>{}{}</plist>", "<array>".repeat(200_000), "</array>".repeat(200_000));+ assert!(parse_plist(deep.as_bytes()).unwrap_err().contains("nested too deeply"));+ let ok = format!("<plist>{}<true/>{}</plist>", "<array>".repeat(20), "</array>".repeat(20));+ assert!(parse_plist(ok.as_bytes()).is_ok());+ }+#[test]fn look_sliders_map_and_the_rest_is_reported() {let i = read_presets("/x/Soft Contrast.lmp", modern().as_bytes(), None).unwrap().remove(0);