tuxmain/webcomment
1
0
Fork 0
Code Issues 20 Pull requests Projects Releases Packages Wiki Activity

Fix CommentId::from_base64 panic

Browse source
This commit is contained in:
Pascal Engélibert 2022-10-24 15:37:54 +02:00
parent dd6b8c76ba
commit 4a6c3db704
Signed by: tuxmain
GPG key ID: 3504BC6D362F7DCA
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/db.rs
View file

@ -82,9 +82,12 @@ impl CommentId {
} }
pub fn from_base64(s: &str) -> Result<Self, base64::DecodeError> { pub fn from_base64(s: &str) -> Result<Self, base64::DecodeError> {
// TODO prevent panic when s is too long
let mut buf = [0; 16]; let mut buf = [0; 16];
base64::decode_config_slice(s, base64::URL_SAFE_NO_PAD, &mut buf).map(|_| Self(buf)) std::panic::catch_unwind(move || {
base64::decode_config_slice(s, base64::URL_SAFE_NO_PAD, &mut buf)
})
.map_err(|_| base64::DecodeError::InvalidLength)?
.map(|_| Self(buf))
} }
} }
@ -96,6 +99,8 @@ impl AsRef<[u8]> for CommentId {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*;
#[test] #[test]
fn test_typed_sled() { fn test_typed_sled() {
let db = sled::Config::new().temporary(true).open().unwrap(); let db = sled::Config::new().temporary(true).open().unwrap();
@ -106,4 +111,9 @@ mod test {
//let mut iter = tree.iter(); //let mut iter = tree.iter();
assert_eq!(iter.next(), Some(Ok(((123, 456), ())))); assert_eq!(iter.next(), Some(Ok(((123, 456), ()))));
} }
#[test]
fn test_from_base64_dont_panic() {
assert_eq!(CommentId::from_base64("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"), Err(base64::DecodeError::InvalidLength));
}
} }