add regression test for #806

apoelstra · apoelstra · commit 6bff186d01bc · 2025-04-21T20:53:51.000Z
When parsing a descriptor with `Descriptor::parse_descriptor`, we first parse
as a string and then parse the keys. We fail to consider parsing errors
in the keys, resulting in a panic.

Also, clean up the panic message so it's clearer what's going on.
diff --git a/src/descriptor/mod.rs b/src/descriptor/mod.rs
@@ -2168,4 +2168,19 @@ pk(03f28773c2d975288bc7d1d205c3748651b075fbc6610e58cddeeddf8f19405aa8))";
         Desc::from_str(&format!("tr({},pk({}))", x_only_key, uncomp_key)).unwrap_err();
         Desc::from_str(&format!("tr({},pk({}))", x_only_key, x_only_key)).unwrap();
     }
+
+    #[test]
+    fn regression_806() {
+        let secp = secp256k1::Secp256k1::signing_only();
+        type Desc = Descriptor<DescriptorPublicKey>;
+        // OK
+        Desc::from_str("pkh(111111111111111111111111111111110000008375319363688624584A111111)")
+            .unwrap_err();
+        // ERR: crashes in translate_pk
+        Desc::parse_descriptor(
+            &secp,
+            "pkh(111111111111111111111111111111110000008375319363688624584A111111)",
+        )
+        .unwrap_err();
+    }
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -356,10 +356,11 @@ impl<E> TranslateErr<E> {
     ///
     /// This function will panic if the Error is OutError.
     pub fn expect_translator_err(self, msg: &str) -> E {
-        if let Self::TranslatorErr(v) = self {
-            v
-        } else {
-            panic!("{}", msg)
+        match self {
+            Self::TranslatorErr(v) => v,
+            Self::OuterError(ref e) => {
+                panic!("Unexpected Miniscript error when translating: {}\nMessage: {}", e, msg)
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -356,10 +356,11 @@ impl<E> TranslateErr<E> {`
`356`	`356`	`///`
`357`	`357`	`/// This function will panic if the Error is OutError.`
`358`	`358`	`pub fn expect_translator_err(self, msg: &str) -> E {`
`359`		`- if let Self::TranslatorErr(v) = self {`
`360`		`- v`
`361`		`- } else {`
`362`		`- panic!("{}", msg)`
	`359`	`+ match self {`
	`360`	`+ Self::TranslatorErr(v) => v,`
	`361`	`+ Self::OuterError(ref e) => {`
	`362`	`+ panic!("Unexpected Miniscript error when translating: {}\nMessage: {}", e, msg)`
	`363`	`+ }`
`363`	`364`	`}`
`364`	`365`	`}`
`365`	`366`	`}`