mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
* sysdeps/unix/sysv/linux/sigwait.c (do_sigwait): Make sure SIGSETXID is not blocked. * sysdeps/unix/sysv/linux/sigwaitinfo.c (do_sigwaitinfo): Likewise. * sysdeps/unix/sysv/linux/sigtimedwait.c (do_sigtimedwait): Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c (__sigprocmask): Likewise. * sysdeps/generic/sigfillset.c (sigfillset): Don't set SIGSETXID.
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1997,1998,2000,2002,2003,2004 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
@ -36,12 +36,20 @@ do_sigwait (const sigset_t *set, int *sig)
|
||||
|
||||
#ifdef SIGCANCEL
|
||||
sigset_t tmpset;
|
||||
if (set != NULL && __sigismember (set, SIGCANCEL))
|
||||
if (set != NULL
|
||||
&& (__builtin_expect (__sigismember (set, SIGCANCEL), 0)
|
||||
# ifdef SIGSETXID
|
||||
|| __builtin_expect (__sigismember (set, SIGSETXID), 0)
|
||||
# endif
|
||||
))
|
||||
{
|
||||
/* Create a temporary mask without the bit for SIGCANCEL set. */
|
||||
// We are not copying more than we have to.
|
||||
memcpy (&tmpset, set, _NSIG / 8);
|
||||
__sigdelset (&tmpset, SIGCANCEL);
|
||||
# ifdef SIGSETXID
|
||||
__sigdelset (&tmpset, SIGSETXID);
|
||||
# endif
|
||||
set = &tmpset;
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user