VectorCraft: An open-source, vector art tool written by scratch in pure Rust
Require two hex digits in SVG href percent escapes
NetterSilvera579ca707316
diff --git a/crates/svg/src/import/files.rs b/crates/svg/src/import/files.rsindex e4732f8cd..1ee025db8 100644--- a/crates/svg/src/import/files.rs+++ b/crates/svg/src/import/files.rs@@ -79,7 +79,11 @@ fn percent_decoded(s: &str) -> String {let mut out = Vec::with_capacity(s.len());let mut rest = s.as_bytes();while let Some((&b, tail)) = rest.split_first() {- let hex = tail.get(..2).and_then(|h| std::str::from_utf8(h).ok()).and_then(|h| u8::from_str_radix(h, 16).ok());+ let hex = tail+ .get(..2)+ .filter(|h| h.iter().all(u8::is_ascii_hexdigit))+ .and_then(|h| std::str::from_utf8(h).ok())+ .and_then(|h| u8::from_str_radix(h, 16).ok());match hex {Some(v) if b == b'%' => {out.push(v);@@ -304,6 +308,13 @@ fn leave_out(why: &AtomicBool, noted: bool) -> Option<ImageKind> {mod tests {use super::*;+ #[test]+ fn percent_decoding_needs_two_hex_digits() {+ assert_eq!(percent_decoded("a%41b"), "aAb");+ assert_eq!(percent_decoded("a%+1b"), "a%+1b");+ assert_eq!(percent_decoded("a%-1b"), "a%-1b");+ }+#[test]fn hrefs_resolve_against_the_folder() {let sep = std::path::MAIN_SEPARATOR;