Merge pull request #4 from RCasatta/fix_short_schema

Fix panic for parsing uri shorter than the length of the schema
payjoin · Jul 30, 2021 · 9c96451 · 9c96451
2 parents c41101d + a4ffaf0
commit 9c96451
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/bip78/src/uri.rs b/bip78/src/uri.rs
@@ -54,7 +54,7 @@ impl<'a> TryFrom<&'a str> for Uri<'a> {
         }
 
         let prefix = "bitcoin:";
-        if !s.chars().zip(prefix.chars()).all(|(left, right)| left.to_ascii_lowercase() == right) {
+        if !s.chars().zip(prefix.chars()).all(|(left, right)| left.to_ascii_lowercase() == right) || s.len() < 8 {
             return Err(InternalBip21Error::BadSchema(s.into()).into())
         }
         let uri_without_prefix = &s[prefix.len()..];
@@ -141,3 +141,17 @@ impl From<InternalPjParseError> for ParseUriError {
         PjParseError(value).into()
     }
 }
+
+
+#[cfg(test)]
+mod tests {
+    use crate::Uri;
+    use std::str::FromStr;
+
+    #[test]
+    fn test_short() {
+        assert!(Uri::from_str("").is_err());
+        assert!(Uri::from_str("bitcoin").is_err());
+        assert!(Uri::from_str("bitcoin:").is_err());
+    }
+}