Skip to content

fix(impl_tokio): prevent panic on errorneous BlockingDirections #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix(impl_tokio): prevent panic on errorneous BlockingDirections #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions async-ssh2-lite/src/session_stream/impl_tokio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ impl AsyncSessionStream for TcpStream {
}

match sess.block_directions() {
BlockDirections::None => {
unreachable!("")
}
BlockDirections::None => continue,
BlockDirections::Inbound => {
assert!(expected_block_directions.is_readable());

Expand Down Expand Up @@ -77,26 +75,20 @@ impl AsyncSessionStream for TcpStream {
}

match sess.block_directions() {
BlockDirections::None => {
unreachable!("")
}
BlockDirections::Inbound => {
assert!(expected_block_directions.is_readable());

BlockDirections::Inbound if expected_block_directions.is_readable() => {
ready!(self.poll_read_ready(cx))?;
}
BlockDirections::Outbound => {
assert!(expected_block_directions.is_writable());

BlockDirections::Outbound if expected_block_directions.is_writable() => {
ready!(self.poll_write_ready(cx))?;
}
BlockDirections::Both => {
assert!(expected_block_directions.is_readable());
assert!(expected_block_directions.is_writable());

BlockDirections::Both
if expected_block_directions.is_readable()
&& expected_block_directions.is_writable() =>
{
ready!(self.poll_write_ready(cx))?;
ready!(self.poll_read_ready(cx))?;
}
_ => return Poll::Pending,
}

if let Some(dur) = sleep_dur {
Expand Down