[[package]]
name = "libc"
-version = "0.2.116"
+version = "0.2.121"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"
+checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f"
dependencies = [
"rustc-std-workspace-core",
]
use crate::sys::unix::os::page_size;
use crate::sys_common::thread_info;
- #[cfg(any(target_os = "linux", target_os = "android"))]
- unsafe fn siginfo_si_addr(info: *mut libc::siginfo_t) -> usize {
- #[repr(C)]
- struct siginfo_t {
- a: [libc::c_int; 3], // si_signo, si_errno, si_code
- si_addr: *mut libc::c_void,
- }
-
- (*(info as *const siginfo_t)).si_addr as usize
- }
-
- #[cfg(not(any(target_os = "linux", target_os = "android")))]
- unsafe fn siginfo_si_addr(info: *mut libc::siginfo_t) -> usize {
- (*info).si_addr as usize
- }
-
// Signal handler for the SIGSEGV and SIGBUS handlers. We've got guard pages
// (unmapped pages) at the end of every thread's stack, so if a thread ends
// up running into the guard page it'll trigger this handler. We want to
_data: *mut libc::c_void,
) {
let guard = thread_info::stack_guard().unwrap_or(0..0);
- let addr = siginfo_si_addr(info);
+ let addr = (*info).si_addr() as usize;
// If the faulting address is within the guard page, then we print a
// message saying so and abort.