Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions tiny_skia/src/vector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use tiny_skia::Transform;

use std::cell::RefCell;
use std::collections::hash_map;
use std::fs;
use std::{fs, panic};
use std::sync::Arc;

#[derive(Debug)]
Expand Down Expand Up @@ -168,7 +168,20 @@ impl Cache {
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 {
// Apply color filter
Expand Down
17 changes: 15 additions & 2 deletions wgpu/src/image/vector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::image::atlas::{self, Atlas};
use resvg::tiny_skia;
use resvg::usvg;
use rustc_hash::{FxHashMap, FxHashSet};
use std::fs;
use std::{fs, panic};
use std::sync::Arc;

/// Entry in cache corresponding to an svg handle
Expand Down Expand Up @@ -154,7 +154,20 @@ impl Cache {
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();

Expand Down