diff --git a/crates/svg/src/tree.rs b/crates/svg/src/tree.rs
index 5cf9df089..cb33137b8 100644
--- a/crates/svg/src/tree.rs
+++ b/crates/svg/src/tree.rs
@@ -405,12 +405,12 @@ fn account_invalid_data_urls(xml: &roxmltree::Document<'_>, used: &Used) {
let Some(href) = href else { continue };
let url = match data_url::DataUrl::process(href) {
Ok(url) => url,
- Err(_) => {
- if href.split_once(':').is_some_and(|(scheme, _)| scheme.eq_ignore_ascii_case("data")) {
- used.invalid_raster.fetch_add(1, Ordering::Relaxed);
- }
+ // Use the parser's normalized scheme recognition, including whitespace.
+ Err(data_url::DataUrlError::NoComma) => {
+ used.invalid_raster.fetch_add(1, Ordering::Relaxed);
continue;
}
+ Err(data_url::DataUrlError::NotADataUrl) => continue,
};
if url.decode(|_| Ok::<(), std::convert::Infallible>(())).is_err() {
used.invalid_raster.fetch_add(1, Ordering::Relaxed);
diff --git a/crates/svg/src/tree/tests.rs b/crates/svg/src/tree/tests.rs
index aa4d5a553..103c0fe7c 100644
--- a/crates/svg/src/tree/tests.rs
+++ b/crates/svg/src/tree/tests.rs
@@ -531,13 +531,15 @@ mod invalid_image_accounting {
#[test]
fn malformed_data_url_without_comma_is_counted() {
- let bad = r#""#;
- let (found, report) = usage(bad, shallow());
- assert!(found.is_empty());
- assert_eq!(report.invalid_raster_images, 1);
- let (found, report) = usage(&embed(&svg(bad)), shallow());
- assert_eq!(found, [true]);
- assert_eq!(report.invalid_raster_images, 1);
+ for href in ["data:image/png;base64", " data:image/png;base64", "da ta:image/png;base64", "da
ta:image/png;base64"] {
+ let bad = format!(r#""#);
+ let (found, report) = usage(&bad, shallow());
+ assert!(found.is_empty(), "{href}");
+ assert_eq!(report.invalid_raster_images, 1, "{href}");
+ let (found, report) = usage(&embed(&svg(&bad)), shallow());
+ assert_eq!(found, [true], "{href}");
+ assert_eq!(report.invalid_raster_images, 1, "{href}");
+ }
}
#[test]