mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-02-14 10:18:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix sigaction() return handler address on XNU/BSD

Browse source
This commit is contained in:
Justine Tunney 2023-11-12 05:40:06 -08:00
parent bd56a9cf51
commit 48bd3d85df
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libc/calls/sigaction.c
View file

@ -251,16 +251,24 @@ static int __sigaction(int sig, const struct sigaction *act,
} }
if (rc != -1) { if (rc != -1) {
sigaction_native2cosmo((union metasigaction *)oldact); sigaction_native2cosmo((union metasigaction *)oldact);
if (oldact && //
oldact->sa_handler != SIG_DFL && //
oldact->sa_handler != SIG_IGN && //
(IsFreebsd() || IsOpenbsd() || IsNetbsd() || IsXnu())) {
oldact->sa_handler =
(sighandler_t)((uintptr_t)__executable_start + __sighandrvas[sig]);
}
} }
} else { } else {
if (oldact) { if (oldact) {
bzero(oldact, sizeof(*oldact)); bzero(oldact, sizeof(*oldact));
oldrva = __sighandrvas[sig]; oldrva = __sighandrvas[sig];
oldact->sa_mask = __sighandmask[sig];
oldact->sa_flags = __sighandflags[sig]; oldact->sa_flags = __sighandflags[sig];
oldact->sa_sigaction = oldact->sa_sigaction =
(sigaction_f)(oldrva < kSigactionMinRva (sigaction_f)(oldrva < kSigactionMinRva
? oldrva ? oldrva
: (intptr_t)&__executable_start + oldrva); : (uintptr_t)&__executable_start + oldrva);
} }
rc = 0; rc = 0;
} }