diff --git a/crates/svg/src/preflight.rs b/crates/svg/src/preflight.rs
index a11a5d9b7..463c3ce16 100644
--- a/crates/svg/src/preflight.rs
+++ b/crates/svg/src/preflight.rs
@@ -96,3 +96,29 @@ pub fn parse_text_with_depth<'a>(svg: &'a str, limits: &Limits) -> Result<(roxml
let xml = roxmltree::Document::parse_with_options(svg, options).map_err(|e| Error::Xml(e.to_string()))?;
Ok((xml, prescan.depth, prescan.open_depth))
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn parsed_tree_reports_source_nesting_depth() -> Result<(), Error> {
+ let limits = Limits { depth: 4, ..Default::default() };
+ let (document, depth, open_depth) = parse_text_with_depth("", &limits)?;
+ assert!(document.root_element().has_tag_name("svg"));
+ assert_eq!(depth, 2);
+ assert_eq!(open_depth, 0);
+ let simple = parse_text("", &limits)?;
+ assert!(simple.root_element().has_tag_name("svg"));
+ Ok(())
+ }
+
+ #[test]
+ fn source_depth_and_xml_errors_keep_their_specific_kind() {
+ let shallow = Limits { depth: 1, ..Default::default() };
+ assert!(matches!(parse_text_with_depth("", &shallow), Err(Error::TooDeep(1))));
+
+ let normal = Limits::default();
+ assert!(matches!(parse_text_with_depth("", &normal), Err(Error::Xml(_))));
+ }
+}
diff --git a/crates/svg/src/tree.rs b/crates/svg/src/tree.rs
index fdabc2a50..20dcd61cd 100644
--- a/crates/svg/src/tree.rs
+++ b/crates/svg/src/tree.rs
@@ -517,11 +517,15 @@ fn embedded(used: &Used, limits: &Limits, data: &[u8], options: &usvg::Options<'
Ok(text) => text,
// What a refused document unpacked before it was refused was work too: it uses up what
// is left, so the next image can't repeat it.
- Err(_) => {
+ Err(svgz::Error::TooLarge(_)) => {
used.bytes.fetch_add(left, Ordering::Relaxed);
used.svg_limit.fetch_add(1, Ordering::Relaxed);
return None;
}
+ Err(_) => {
+ used.invalid_svg.fetch_add(1, Ordering::Relaxed);
+ return None;
+ }
};
used.bytes.fetch_add(text.len(), Ordering::Relaxed);
let checked = match preflight(&text, limits) {