Skip to content
Open
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ impl TryFrom<v1::Multisig> for MultisigPayload {
));
}

// Find the maximum key to determine the vector size
let required_len = signatures
.iter()
.map(|entry| entry.index + 1)
.max()
.unwrap_or(0);
// Find the maximum key to determine the vector size.
let mut required_len = 0u32;
for entry in &signatures {
let signer_len = entry.index.checked_add(1).ok_or_else(|| {
Error::invalid_data("Multisig ECDSA signer index overflow".to_string())
})?;
required_len = required_len.max(signer_len);
}
Comment thread
Ekleog-Polygon marked this conversation as resolved.

if required_len as usize > MAX_SIGNERS {
return Err(Error::invalid_data(format!(
Expand Down
20 changes: 20 additions & 0 deletions crates/agglayer-interop-grpc-types/src/compat/v1/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,26 @@ fn error_messages(#[case] name: &str, #[case] error: Error) {
);
}

#[test]
fn multisig_decode_rejects_signer_index_overflow() {
let multisig = v1::Multisig {
data: Some(v1::multisig::Data::Ecdsa(v1::EcdsaMultisig {
signatures: vec![v1::ecdsa_multisig::EcdsaMultisigEntry {
index: u32::MAX,
signature: None,
}],
})),
};

let err = agglayer_interop_types::aggchain_proof::MultisigPayload::try_from(multisig)
.expect_err(
"u32::MAX signer index should return a typed invalid-data error instead of panicking",
);

assert!(matches!(err.kind(), super::ErrorKind::InvalidData));
assert_eq!(err.to_string(), "Multisig ECDSA signer index overflow");
}

macro_rules! make_parser_fuzzers {
($test:ident, $proto:ty, $type:ty) => {
#[test]
Expand Down
Loading
Loading