leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: prevent crashes from SVG rendering

Browse source
This commit is contained in:
Hendrik Hamerlinck 2025-11-23 12:39:22 +01:00
parent 8bfd099c59
commit d845ac27db
No known key found for this signature in database
GPG key ID: 34BCF97CC5893BCF
2 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tiny_skia/src/vector.rs
View file

@ -7,7 +7,7 @@ use tiny_skia::Transform;
use std::cell::RefCell; use std::cell::RefCell;
use std::collections::hash_map; use std::collections::hash_map;
use std::fs; use std::{fs, panic};
use std::sync::Arc; use std::sync::Arc;
#[derive(Debug)] #[derive(Debug)]
@ -168,7 +168,20 @@ impl Cache {
tiny_skia::Transform::default() tiny_skia::Transform::default()
}; };
resvg::render(tree, transform, &mut image.as_mut()); // SVG rendering can panic on malformed or complex vectors.
// We catch panics to prevent crashes and continue gracefully.
let render_result =
panic::catch_unwind(panic::AssertUnwindSafe(|| {
resvg::render(tree, transform, &mut image.as_mut());
}));
if render_result.is_err() {
log::warn!(
"SVG rendering panicked for handle ID: {}",
handle.id()
);
return None;
}
if let Some([r, g, b, _]) = key.color { if let Some([r, g, b, _]) = key.color {
// Apply color filter // Apply color filter

17
wgpu/src/image/vector.rs
View file

@ -5,7 +5,7 @@ use crate::image::atlas::{self, Atlas};
use resvg::tiny_skia; use resvg::tiny_skia;
use resvg::usvg; use resvg::usvg;
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::{FxHashMap, FxHashSet};
use std::fs; use std::{fs, panic};
use std::sync::Arc; use std::sync::Arc;
/// Entry in cache corresponding to an svg handle /// Entry in cache corresponding to an svg handle
@ -154,7 +154,20 @@ impl Cache {
tiny_skia::Transform::default() tiny_skia::Transform::default()
}; };
resvg::render(tree, transform, &mut img.as_mut()); // SVG rendering can panic on malformed or complex vectors.
// We catch panics to prevent crashes and continue gracefully.
let render_result =
panic::catch_unwind(panic::AssertUnwindSafe(|| {
resvg::render(tree, transform, &mut img.as_mut());
}));
if render_result.is_err() {
log::warn!(
"SVG rendering panicked for handle ID: {}",
handle.id()
);
return None;
}
let mut rgba = img.take(); let mut rgba = img.take();