Fix reference getting moved
The sigaction handler called map on an option, creating a pointer to a move value. This in turned caused UB for signal handlers. Avoid using pointers directly, and instead prefer references.
This commit is contained in:
+13
-17
@@ -1,6 +1,6 @@
|
||||
//! signal implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/signal.h.html
|
||||
|
||||
use core::{mem, ptr};
|
||||
use core::mem;
|
||||
|
||||
use cbitset::BitSet;
|
||||
|
||||
@@ -21,9 +21,9 @@ pub mod sys;
|
||||
|
||||
type SigSet = BitSet<[c_ulong; 1]>;
|
||||
|
||||
pub (crate) const SIG_DFL: usize = 0;
|
||||
pub (crate) const SIG_IGN: usize = 1;
|
||||
pub (crate) const SIG_ERR: isize = -1;
|
||||
pub(crate) const SIG_DFL: usize = 0;
|
||||
pub(crate) const SIG_IGN: usize = 1;
|
||||
pub(crate) const SIG_ERR: isize = -1;
|
||||
|
||||
pub const SIG_BLOCK: c_int = 0;
|
||||
pub const SIG_UNBLOCK: c_int = 1;
|
||||
@@ -86,18 +86,12 @@ pub unsafe extern "C" fn sigaction(
|
||||
act: *const sigaction,
|
||||
oact: *mut sigaction,
|
||||
) -> c_int {
|
||||
let act_opt = if !act.is_null() {
|
||||
let mut act_clone = (*act).clone();
|
||||
let act_opt = act.as_ref().map(|act| {
|
||||
let mut act_clone = act.clone();
|
||||
act_clone.sa_flags |= SA_RESTORER as c_ulong;
|
||||
Some(act_clone)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
println!("sig => {:?}", act_opt);
|
||||
println!("osig => {:?}", (*oact));
|
||||
let out = Sys::sigaction(sig, act_opt.map_or(ptr::null_mut(), |x| &x), oact);
|
||||
println!("aosig => {:?}", (*oact).sa_handler);
|
||||
out
|
||||
act_clone
|
||||
});
|
||||
Sys::sigaction(sig, act_opt.as_ref(), oact.as_mut())
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
@@ -198,8 +192,10 @@ extern "C" {
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
pub extern "C" fn signal(sig: c_int, func: Option<extern "C" fn(c_int)>) -> Option<extern "C" fn(c_int)> {
|
||||
println!("{:?}", func);
|
||||
pub extern "C" fn signal(
|
||||
sig: c_int,
|
||||
func: Option<extern "C" fn(c_int)>,
|
||||
) -> Option<extern "C" fn(c_int)> {
|
||||
let sa = sigaction {
|
||||
sa_handler: func,
|
||||
sa_flags: SA_RESTART as c_ulong,
|
||||
|
||||
Reference in New Issue
Block a user