mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-16 23:42:27 +00:00
fix(svg): preserve omission accounting on malformed data
This commit is contained in:
1 parent
4e9b3e9fdd
commit
586041bb68
2 files changed
+48
-1
No files matched your search
+12
-1
@@ -403,7 +403,15 @@ fn account_invalid_data_urls(xml: &roxmltree::Document<'_>, used: &Used) {
|
||||
for node in xml.descendants().filter(|n| n.is_element() && matches!(n.tag_name().name(), "image" | "feImage")) {
|
||||
let href = node.attribute(("http://www.w3.org/1999/xlink", "href")).or_else(|| node.attribute("href"));
|
||||
let Some(href) = href else { continue };
|
||||
let Ok(url) = data_url::DataUrl::process(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);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
};
|
||||
if url.decode(|_| Ok::<(), std::convert::Infallible>(())).is_err() {
|
||||
used.invalid_raster.fetch_add(1, Ordering::Relaxed);
|
||||
}
|
||||
@@ -460,6 +468,9 @@ fn raster_image(used: &Used, limits: &Limits, data: Arc<Vec<u8>>, format: craft_
|
||||
let decode_limits = craft_image_codecs::Limits::new(width, height, pixels, limits.embedded_raster_pixels.saturating_mul(8));
|
||||
let options = craft_image_codecs::DecodeOptions { limits: decode_limits, keep_orientation: true };
|
||||
if let Err(error) = craft_image_codecs::decode_as_with(format, &data, &options) {
|
||||
// No tree retains this allocation on failure. Forget its address before it
|
||||
// can be reused, but keep the pixel charge for the decode work already spent.
|
||||
used.raster_data.lock().unwrap_or_else(PoisonError::into_inner).remove(&pointer);
|
||||
match error {
|
||||
craft_image_codecs::CodecError::LimitExceeded(_) => {
|
||||
used.raster_limit.fetch_add(1, Ordering::Relaxed);
|
||||
|
||||
@@ -529,6 +529,42 @@ mod invalid_image_accounting {
|
||||
assert_eq!(report.invalid_raster_images, 1);
|
||||
}
|
||||
|
||||
#[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);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn failed_decode_forgets_address_but_preserves_spent_budget() {
|
||||
let valid = png();
|
||||
let idat = valid.windows(4).position(|b| b == b"IDAT").unwrap();
|
||||
let invalid = Arc::new(valid[..idat + 4].to_vec());
|
||||
let pointer = Arc::as_ptr(&invalid) as usize;
|
||||
let limits = Limits { embedded_raster_pixels: 3, ..shallow() };
|
||||
let resolver = ImageResolver::new(limits);
|
||||
let used = &resolver.used;
|
||||
let format = craft_image_codecs::Format::Png;
|
||||
assert!(raster_image(used, &limits, invalid, format).is_none());
|
||||
assert!(!used.raster_data.lock().unwrap().contains(&pointer));
|
||||
assert_eq!(resolver.usage().raster_pixels, 1);
|
||||
let first_data = Arc::new(valid.clone());
|
||||
let first = raster_image(used, &limits, first_data.clone(), format).unwrap();
|
||||
assert_eq!(resolver.usage().raster_pixels, 2);
|
||||
let repeated = raster_image(used, &limits, first_data, format).unwrap();
|
||||
assert_eq!(resolver.usage().raster_pixels, 2);
|
||||
let second = raster_image(used, &limits, Arc::new(valid.clone()), format).unwrap();
|
||||
assert_eq!(resolver.usage().raster_pixels, 3);
|
||||
assert!(raster_image(used, &limits, Arc::new(valid), format).is_none());
|
||||
assert_eq!(resolver.usage().raster_limit_images, 1);
|
||||
drop((first, repeated, second));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn corrupt_pixels_do_not_pass_a_valid_header_probe() {
|
||||
let valid = png();
|
||||
|
||||
Reference in new issue
Block a user