leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not ignore errors in reserve_next_needed_piece()

Browse source
This commit is contained in:
Igor Katson 2023-12-25 09:24:57 -05:00
parent 8cdf44c4fd
commit dfdb6b5fae
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/librqbit/src/torrent_state/live/mod.rs
View file

@ -1011,10 +1011,15 @@ impl PeerHandler {
} }
} }
let n_opt = match n_opt {
Some(n_opt) => n_opt,
None => return Ok(None),
};
self.state self.state
.lengths .lengths
.validate_piece_index(n_opt.context("invalid n_opt")? as u32) .validate_piece_index(n_opt as u32)
.context("invalid piece")? .context("bug: invalid piece")?
}; };
g.inflight_pieces.insert( g.inflight_pieces.insert(
n, n,
@ -1214,7 +1219,7 @@ impl PeerHandler {
// Afterwards means we are close to completion, try stealing more aggressively. // Afterwards means we are close to completion, try stealing more aggressively.
let next = match self let next = match self
.try_steal_old_slow_piece(10.) .try_steal_old_slow_piece(10.)
.or_else(|| self.reserve_next_needed_piece().ok().flatten()) .map_or_else(|| self.reserve_next_needed_piece(), |v| Ok(Some(v)))?
.or_else(|| self.try_steal_old_slow_piece(3.)) .or_else(|| self.try_steal_old_slow_piece(3.))
{ {
Some(next) => next, Some(next) => next,