diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | signal.c | 20 |
2 files changed, 21 insertions, 7 deletions
@@ -1,3 +1,11 @@ +Sun Feb 20 02:14:09 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * signal.c (sig_trap): avoid pthread_sigmask(xx, &mask, &mask) usage + because FreeBSD don't permit it. If it's used, it behave as + pthread_sigmask(xx, NULL, &mask). + + * signal.c (init_sigchld): ditto. + Sun Feb 20 00:46:51 2011 Tanaka Akira <akr@fsij.org> * ext/openssl/ossl_bn.c: parenthesize macro arguments. @@ -964,11 +964,15 @@ sig_trap(int argc, VALUE *argv) rb_raise(rb_eSecurityError, "Insecure: tainted signal trap"); } #if USE_TRAP_MASK - /* disable interrupt */ - sigfillset(&arg.mask); - pthread_sigmask(SIG_BLOCK, &arg.mask, &arg.mask); - - return rb_ensure(trap, (VALUE)&arg, trap_ensure, (VALUE)&arg); + { + sigset_t fullmask; + + /* disable interrupt */ + sigfillset(&fullmask); + pthread_sigmask(SIG_BLOCK, &fullmask, &arg.mask); + + return rb_ensure(trap, (VALUE)&arg, trap_ensure, (VALUE)&arg); + } #else return trap(&arg); #endif @@ -1014,15 +1018,17 @@ init_sigchld(int sig) #if USE_TRAP_MASK # ifdef HAVE_SIGPROCMASK sigset_t mask; + sigset_t fullmask; # else int mask; + int fullmask; # endif #endif #if USE_TRAP_MASK /* disable interrupt */ - sigfillset(&mask); - pthread_sigmask(SIG_BLOCK, &mask, &mask); + sigfillset(&fullmask); + pthread_sigmask(SIG_BLOCK, &fullmask, &mask); #endif oldfunc = ruby_signal(sig, SIG_DFL); |