From df52785d301a991332d0bff7b37bcee31133a7c0 Mon Sep 17 00:00:00 2001 From: kosaki Date: Sat, 19 Feb 2011 18:14:30 +0000 Subject: * 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- signal.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'signal.c') diff --git a/signal.c b/signal.c index 27d90acf4d..d53c56491c 100644 --- a/signal.c +++ b/signal.c @@ -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); -- cgit v1.2.3