Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/miniscript/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -308,12 +308,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
<Pk as str::FromStr>::Err: ToString,
<<Pk as MiniscriptKey>::Hash as str::FromStr>::Err: ToString,
{
for ch in s.as_bytes() {
if *ch < 20 || *ch > 127 {
return Err(Error::Unprintable(*ch));
}
}

// This checks for invalid ASCII chars
let top = expression::Tree::from_str(s)?;
let ms: Miniscript<Pk, Ctx> = expression::FromTree::from_tree(&top)?;

Expand Down Expand Up @@ -898,4 +893,12 @@ mod tests {
))
.is_err());
}

#[test]
fn non_ascii() {
assert!(Segwitv0Script::from_str_insane("🌏")
.unwrap_err()
.to_string()
.contains("unprintable character"));
}
}