mirror of
https://git.musl-libc.org/git/musl
synced 2025-02-10 07:14:15 +03:00
fix breakage in cancellation due to signal functions overhaul
sigaddset was not accepting SIGCANCEL as a valid signal number.
This commit is contained in:
parent
88c4e72031
commit
344ea14885
@ -31,6 +31,12 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
|
||||
return r;
|
||||
}
|
||||
|
||||
static void _sigaddset(sigset_t *set, int sig)
|
||||
{
|
||||
unsigned s = sig-1;
|
||||
set->__bits[s/8/sizeof *set->__bits] |= 1UL<<(s&8*sizeof *set->__bits-1);
|
||||
}
|
||||
|
||||
static void cancel_handler(int sig, siginfo_t *si, void *ctx)
|
||||
{
|
||||
pthread_t self = __pthread_self();
|
||||
@ -40,7 +46,7 @@ static void cancel_handler(int sig, siginfo_t *si, void *ctx)
|
||||
|
||||
if (!self->cancel || self->canceldisable) return;
|
||||
|
||||
sigaddset(&uc->uc_sigmask, SIGCANCEL);
|
||||
_sigaddset(&uc->uc_sigmask, SIGCANCEL);
|
||||
|
||||
if (self->cancelasync || sp == self->cp_sp && ip <= self->cp_ip) {
|
||||
self->canceldisable = 1;
|
||||
|
Loading…
x
Reference in New Issue
Block a user