fix(svg): use normalized data URL error accounting

This commit is contained in:
Dylan M. Taylor committed 2026-11-15 04:32:18 -05:00
1 parent 586041bb68
commit d594b6763b
2 files changed
+13 -11

No files matched your search

+4 -4
View File
@@ -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);
+9 -7
View File
@@ -531,13 +531,15 @@ mod invalid_image_accounting {
#[test]
fn malformed_data_url_without_comma_is_counted() {
let bad = r#"<image width="1" height="1" xlink:href="data:image/png;base64"/>"#;
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&#x9;ta:image/png;base64", "da&#xA;ta:image/png;base64"] {
let bad = format!(r#"<image width="1" height="1" xlink:href="{href}"/>"#);
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]