Skip to content

Use libc::sigaction() instead of sys::signal() to prevent a deadlock #88828

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
merged 3 commits into from
Oct 6, 2021
Merged

Use libc::sigaction() instead of sys::signal() to prevent a deadlock #88828

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1c8acc
Use `libc::sigaction()` instead of `sys::signal()` to prevent a deadlock
FabianWolff Sep 10, 2021
e3e5ae9
Clean up unneeded explicit pointer cast
dtolnay Sep 29, 2021
65ef265
Call `libc::sigaction()` only on Android
FabianWolff Oct 1, 2021
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
7 changes: 3 additions & 4 deletions library/std/src/sys/unix/process/process_unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,9 @@ impl Command {
let mut set = MaybeUninit::<libc::sigset_t>::uninit();
cvt(sigemptyset(set.as_mut_ptr()))?;
cvt(libc::pthread_sigmask(libc::SIG_SETMASK, set.as_ptr(), ptr::null_mut()))?;
let ret = sys::signal(libc::SIGPIPE, libc::SIG_DFL);
if ret == libc::SIG_ERR {
return Err(io::Error::last_os_error());
}
let mut action: libc::sigaction = mem::zeroed();
action.sa_sigaction = libc::SIG_DFL;
cvt(libc::sigaction(libc::SIGPIPE, &action as *const _, ptr::null_mut()))?;
}

for callback in self.get_closures().iter_mut() {
Expand Down