Skip to content

Commit aa22009

Browse files
committed
Merge bitcoin/bitcoin#25700: psbt: Fix unsigned integer overflow
4fa7983 psbt: Fix unsigned integer overflow (Aurèle Oulès) Pull request description: Fixes #25692. This change prevents an unsigned integer overflow during the deserialization of a PSBT. ACKs for top commit: achow101: ACK 4fa7983 Tree-SHA512: 0863d4d31ada1ba50632b6a66cb4c694c0a15680a90cf9370129cf3db15e3c10e65610b779db047d5a4cc7c920708b728948708e4023e916099c6bfe730f01f9
2 parents 5057adf + 4fa7983 commit aa22009

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/psbt.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -893,6 +893,9 @@ struct PSBTOutput
893893
s >> leaf_hashes;
894894
size_t after_hashes = s.size();
895895
size_t hashes_len = before_hashes - after_hashes;
896+
if (hashes_len > value_len) {
897+
throw std::ios_base::failure("Output Taproot BIP32 keypath has an invalid length");
898+
}
896899
size_t origin_len = value_len - hashes_len;
897900
m_tap_bip32_paths.emplace(xonly, std::make_pair(leaf_hashes, DeserializeKeyOrigin(s, origin_len)));
898901
break;

0 commit comments

Comments
 (0)