8000 process-backend: don't panic on transport failure by schopin-mozilla · Pull Request #248 · rust-minidump/minidump-writer · GitHub
[go: up one dir, main page]
Skip to content

process-backend: don't panic on transport failure #248

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

Merged
gabrielesvelto merged 1 commit into from
Oct 26, 2026
Merged

process-backend: don't panic on transport failure #248

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions crates/linux/process-backend/src/lib.rs
8000 View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,6 @@ pub enum Error {
Transport(#[source] remote::transport::BackendError),
#[error("buffer was too small to contain the result")]
BufferTooSmall,
#[error("the remote executor is unusable after a previous error")]
TransportPoisoned,
}
8 changes: 4 additions & 4 deletions crates/linux/process-backend/src/remote/backend.rs
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ enum TransportState<T> {
}

impl<T> TransportState<T> {
fn expect_ready(&mut self) -> &mut T {
fn ready(&mut self) -> Result<&mut T> {
match self {
TransportState::Ready(transport) => transport,
TransportState::Poisoned => panic!("attempted to use poisoned transport"),
TransportState::Ready(transport) => Ok(transport),
TransportState::Poisoned => Err(Error::TransportPoisoned),
}
}
}
Expand Down Expand Up @@ -60,7 +60,7 @@ impl<T: transport::Backend> Backend<T> {
F: for<'output> FnOnce(Op::Output<'output>) -> Result<U>,
{
let mut transport_state = self.transport_state.borrow_mut();
let transport = transport_state.expect_ready();
let transport = transport_state.ready()?;

let e = match Op::request(transport, args) {
Ok(response) => {
Expand Down
19 changes: 19 additions & 0 deletions crates/linux/process-backend/tests/basic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,22 @@ fn basic() {

executor_thread.join().unwrap().unwrap();
}

#[test]
fn poisoned_transport_returns_error() {
let (backend_io, executor_io) = UnixStream::pair().unwrap();
// Forcefully break the connection
drop(executor_io);

let output_buf = vec![0u8; MAX_OUTPUT_LEN];
let backend = Backend::new(transport::postcard::Backend::new(backend_io, output_buf));

assert!(matches!(
backend.stat_file(c"/"),
Err(process_backend::Error::Transport(_))
));
assert!(matches!(
backend.stat_file(c"/"),
Err(process_backend::Error::TransportPoisoned)
));
}
Loading
0