rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Let stack_overflow:👿:cleanup call drop_handler directly

Browse Source 
instead of through the Drop impl for Handler
This commit is contained in:
bjorn3
2021-10-08 13:29:03 +02:00
parent bf9e6e5598
commit d2c83774d3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
library/std/src/sys/unix/stack_overflow.rs
View File

@@ -6,7 +6,7 @@ pub use self::imp::cleanup;
pub use self::imp::init; pub use self::imp::init;
pub struct Handler { pub struct Handler {
_data: *mut libc::c_void, data: *mut libc::c_void,
} }
impl Handler { impl Handler {
@@ -15,14 +15,14 @@ impl Handler {
} }
fn null() -> Handler { fn null() -> Handler {
Handler { _data: crate::ptr::null_mut() } Handler { data: crate::ptr::null_mut() }
} }
} }
impl Drop for Handler { impl Drop for Handler {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
drop_handler(self); drop_handler(self.data);
} }
} }
} }
@@ -134,12 +134,12 @@ mod imp {
} }
let handler = make_handler(); let handler = make_handler();
MAIN_ALTSTACK.store(handler._data, Ordering::Relaxed); MAIN_ALTSTACK.store(handler.data, Ordering::Relaxed);
mem::forget(handler); mem::forget(handler);
} }
pub unsafe fn cleanup() { pub unsafe fn cleanup() {
Handler { _data: MAIN_ALTSTACK.load(Ordering::Relaxed) }; drop_handler(MAIN_ALTSTACK.load(Ordering::Relaxed));
} }
unsafe fn get_stackp() -> *mut libc::c_void { unsafe fn get_stackp() -> *mut libc::c_void {
@@ -175,14 +175,14 @@ mod imp {
if stack.ss_flags & SS_DISABLE != 0 { if stack.ss_flags & SS_DISABLE != 0 {
stack = get_stack(); stack = get_stack();
sigaltstack(&stack, ptr::null_mut()); sigaltstack(&stack, ptr::null_mut());
Handler { _data: stack.ss_sp as *mut libc::c_void } Handler { data: stack.ss_sp as *mut libc::c_void }
} else { } else {
Handler::null() Handler::null()
} }
} }
pub unsafe fn drop_handler(handler: &mut Handler) { pub unsafe fn drop_handler(data: *mut libc::c_void) {
if !handler._data.is_null() { if !data.is_null() {
let stack = libc::stack_t { let stack = libc::stack_t {
ss_sp: ptr::null_mut(), ss_sp: ptr::null_mut(),
ss_flags: SS_DISABLE, ss_flags: SS_DISABLE,
@@ -195,7 +195,7 @@ mod imp {
sigaltstack(&stack, ptr::null_mut()); sigaltstack(&stack, ptr::null_mut());
// We know from `get_stackp` that the alternate stack we installed is part of a mapping // We know from `get_stackp` that the alternate stack we installed is part of a mapping
// that started one page earlier, so walk back a page and unmap from there. // that started one page earlier, so walk back a page and unmap from there.
munmap(handler._data.sub(page_size()), SIGSTKSZ + page_size()); munmap(data.sub(page_size()), SIGSTKSZ + page_size());
} }
} }
} }
@@ -219,5 +219,5 @@ mod imp {
super::Handler::null() super::Handler::null()
} }
pub unsafe fn drop_handler(_handler: &mut super::Handler) {} pub unsafe fn drop_handler(_data: *mut libc::c_void) {}
} }