Skip to content

Commit

Permalink
fix(iroh-sync): fix panic in send (#1773)
Browse files Browse the repository at this point in the history
## Description

this was referring to entries by index, which will fail if two items are
removed in one iteration.

We are now iterating in reverse order, so removal won't shift the
remaining elements.

## Notes & open questions

<!-- Any notes, remarks or open questions you have to make about the PR.
-->

## Change checklist

- [x] Self-review.
- [x] Documentation updates if relevant.
- [x] Tests if relevant.
  • Loading branch information
rklaehn committed Nov 6, 2023
1 parent fbeeab7 commit c36cc6d
Showing 1 changed file with 20 additions and 1 deletion.
21 changes: 20 additions & 1 deletion iroh/src/sync_engine/live.rs
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,8 @@ impl Subscribers {
async fn send(&mut self, event: Event) -> bool {
let futs = self.0.iter().map(|sender| sender.send_async(event.clone()));
let res = futures::future::join_all(futs).await;
for (i, res) in res.into_iter().enumerate() {
// reverse the order so removing does not shift remaining indices
for (i, res) in res.into_iter().enumerate().rev() {
if res.is_err() {
self.0.remove(i);
}
Expand Down Expand Up @@ -782,3 +783,21 @@ fn fmt_accept_namespace(res: &Result<SyncFinished, AcceptError>) -> String {
.unwrap_or_else(|| "unknown".to_string()),
}
}

#[cfg(test)]
mod tests {
use super::*;

#[tokio::test]
async fn test_sync_remove() {
let pk = PublicKey::from_bytes(&[1; 32]).unwrap();
let (a_tx, a_rx) = flume::unbounded();
let (b_tx, b_rx) = flume::unbounded();
let mut subscribers = Subscribers::default();
subscribers.subscribe(a_tx);
subscribers.subscribe(b_tx);
drop(a_rx);
drop(b_rx);
subscribers.send(Event::NeighborUp(pk)).await;
}
}

0 comments on commit c36cc6d

Please sign in to comment.