Fix ToUsize conversions on 32-bit.

Foundation-Devices · Dec 12, 2024 · 62b1879 · 62b1879
1 parent e663615
commit 62b1879
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/psbt/src/parser/input.rs b/psbt/src/parser/input.rs
@@ -7,7 +7,7 @@ use bitcoin_hashes::{hash160, ripemd160, sha256, sha256d};
 
 use nom::branch::alt;
 use nom::bytes::complete::tag;
-use nom::combinator::{eof, map, rest};
+use nom::combinator::{eof, map, map_res, rest};
 use nom::error::{context, ContextError, ErrorKind, FromExternalError, ParseError};
 use nom::multi::length_value;
 use nom::number::complete::{le_u32, le_u64};
@@ -219,11 +219,18 @@ where
         + Slice<core::ops::RangeFrom<usize>>,
     Error: ParseError<Input>,
     Error: ContextError<Input>,
+    Error: FromExternalError<Input, TryFromIntError>,
 {
     let amount = context("amount", le_u64);
     let script_pubkey = context(
         "script pubkey",
-        length_value(context("script pubkey length", compact_size), rest),
+        length_value(
+            context(
+                "script pubkey length",
+                map_res(compact_size, usize::try_from),
+            ),
+            rest,
+        ),
     );
 
     map(tuple((amount, script_pubkey)), |(amount, script_pubkey)| {

diff --git a/psbt/src/parser/keypair.rs b/psbt/src/parser/keypair.rs
@@ -33,7 +33,7 @@ where
     E: ParseError<I> + ContextError<I> + FromExternalError<I, TryFromIntError>,
 {
     let value = length_value(
-        map_res(compact_size, |v| usize::try_from(v)),
+        map_res(compact_size, usize::try_from),
         context("when parsing value", value),
     );