LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Reject signed strings in Hash128::parse
NetterSilverdd119ca0074c
diff --git a/crates/preview/src/hash.rs b/crates/preview/src/hash.rsindex e3ab51fe8..63650fd16 100644--- a/crates/preview/src/hash.rs+++ b/crates/preview/src/hash.rs@@ -18,7 +18,8 @@ impl fmt::Display for Hash128 {impl Hash128 {pub fn parse(s: &str) -> Option<Hash128> {- (s.len() == 32).then(|| u128::from_str_radix(s, 16).ok().map(Hash128)).flatten()+ // `from_str_radix` also accepts a leading '+', so check the digits explicitly.+ (s.len() == 32 && s.bytes().all(|b| b.is_ascii_hexdigit())).then(|| u128::from_str_radix(s, 16).ok().map(Hash128)).flatten()}}@@ -59,3 +60,16 @@ impl Hasher128 {pub fn hash_bytes(bytes: &[u8]) -> Hash128 {Hasher128::new().update(bytes).finish()}++#[cfg(test)]+mod tests {+ use super::*;++ #[test]+ fn parse_rejects_signed_and_non_hex() {+ assert_eq!(Hash128::parse(&format!("+{}", "1".repeat(31))), None);+ assert_eq!(Hash128::parse(&format!("-{}", "1".repeat(31))), None);+ let h = "0123456789abcdefABCDEF0123456789";+ assert_eq!(Hash128::parse(h).map(|x| x.to_string()), Some(h.to_lowercase()));+ }+}