Skip to content

Commit

Permalink
fix panic when receiving already reset push promise (#597)
Browse files Browse the repository at this point in the history
Found by oss-fuzz
  • Loading branch information
seanmonstar authored Jan 21, 2022
1 parent a28a39c commit 7de2ccc
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/proto/streams/recv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,16 @@ impl Recv {
}
}

pub(super) fn maybe_reset_next_stream_id(&mut self, id: StreamId) {
if let Ok(next_id) = self.next_stream_id {
// !Peer::is_local_init should have been called beforehand
debug_assert_eq!(id.is_server_initiated(), next_id.is_server_initiated());
if id >= next_id {
self.next_stream_id = id.next_id();
}
}
}

/// Returns true if the remote peer can reserve a stream with the given ID.
pub fn ensure_can_reserve(&self) -> Result<(), Error> {
if !self.is_push_enabled {
Expand Down
4 changes: 4 additions & 0 deletions src/proto/streams/streams.rs
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,10 @@ impl Inner {
// We normally would open this stream, so update our
// next-send-id record.
self.actions.send.maybe_reset_next_stream_id(id);
} else {
// We normally would recv this stream, so update our
// next-recv-id record.
self.actions.recv.maybe_reset_next_stream_id(id);
}

let stream = Stream::new(id, 0, 0);
Expand Down

0 comments on commit 7de2ccc

Please sign in to comment.