fix panic when receiving already reset push promise (#597)

Found by oss-fuzz
This commit is contained in:
Sean McArthur
2022-01-21 15:41:39 -08:00
committed by GitHub
parent a28a39ca4a
commit 7de2ccc1a3
2 changed files with 14 additions and 0 deletions

View File

@@ -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. /// Returns true if the remote peer can reserve a stream with the given ID.
pub fn ensure_can_reserve(&self) -> Result<(), Error> { pub fn ensure_can_reserve(&self) -> Result<(), Error> {
if !self.is_push_enabled { if !self.is_push_enabled {

View File

@@ -883,6 +883,10 @@ impl Inner {
// We normally would open this stream, so update our // We normally would open this stream, so update our
// next-send-id record. // next-send-id record.
self.actions.send.maybe_reset_next_stream_id(id); 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); let stream = Stream::new(id, 0, 0);