gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bad predicate with malformed gossip votes (#12072) (#12078)

Browse Source 
(cherry picked from commit eabc63cdcd)

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
This commit is contained in:
mergify[bot]
2020-09-06 05:35:00 +00:00
committed by GitHub
parent 6a74bc1297
commit cd139b8185
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/cluster_info_vote_listener.rs
View File

@@ -641,11 +641,11 @@ impl ClusterInfoVoteListener {
let mut new_optimistic_confirmed_slots = vec![]; let mut new_optimistic_confirmed_slots = vec![];
// Process votes from gossip and ReplayStage // Process votes from gossip and ReplayStage
for (i, (vote_pubkey, vote, _)) in gossip_vote_txs for (is_gossip, (vote_pubkey, vote, _)) in gossip_vote_txs
.iter() .iter()
.filter_map(|gossip_tx| { .filter_map(|gossip_tx| {
vote_transaction::parse_vote_transaction(gossip_tx).filter( vote_transaction::parse_vote_transaction(gossip_tx)
|(vote_pubkey, vote, _)| { .filter(|(vote_pubkey, vote, _)| {
if vote.slots.is_empty() { if vote.slots.is_empty() {
return false; return false;
} }
@@ -671,11 +671,10 @@ impl ClusterInfoVoteListener {
} }
true true
}, })
) .map(|v| (true, v))
}) })
.chain(replayed_votes) .chain(replayed_votes.into_iter().map(|v| (false, v)))
.enumerate()
{ {
Self::update_new_votes( Self::update_new_votes(
vote, vote,
@@ -686,7 +685,7 @@ impl ClusterInfoVoteListener {
verified_vote_sender, verified_vote_sender,
&mut diff, &mut diff,
&mut new_optimistic_confirmed_slots, &mut new_optimistic_confirmed_slots,
i < gossip_vote_txs.len(), is_gossip,
); );
} }