EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Reject non-hex characters such as '+' in Rgba::from_hex
NetterSilver52bfb9c4bbca
diff --git a/crates/color/src/lib.rs b/crates/color/src/lib.rsindex 5545f390d..a8957bcb9 100644--- a/crates/color/src/lib.rs+++ b/crates/color/src/lib.rs@@ -39,7 +39,13 @@ impl Rgba {/// `#rrggbb` or `#rrggbbaa`.pub fn from_hex(s: &str) -> Option<Rgba> {let s = s.trim().trim_start_matches('#');- let p = |i: usize| u8::from_str_radix(s.get(i..i + 2)?, 16).ok();+ let p = |i: usize| {+ let pair = s.get(i..i + 2)?;+ if !pair.bytes().all(|b| b.is_ascii_hexdigit()) {+ return None;+ }+ u8::from_str_radix(pair, 16).ok()+ };match s.len() {6 => Some(Rgba::from_u8(p(0)?, p(2)?, p(4)?)),8 => Some(Rgba { a: p(6)? as f32 / 255.0, ..Rgba::from_u8(p(0)?, p(2)?, p(4)?) }),@@ -262,6 +268,14 @@ mod tests {assert!(r > 0.99 && g < 0.01 && b < 0.01, "{r} {g} {b}");}+ #[test]+ fn rejects_signed_hex_pairs() {+ assert!(Rgba::from_hex("#+1+2+3").is_none());+ assert!(Rgba::from_hex("#1+2+3+").is_none());+ assert!(Rgba::from_hex("#ff00+0ff").is_none());+ assert!(Rgba::from_hex("#a1B2c3").is_some());+ }+#[test]fn srgb_roundtrip() {for i in 0..=100 {