From fad56622f7aef6ed82339852b3a4aea3cabe6430 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 29 May 2014 14:27:53 +0000 Subject: [PATCH] signal.c: return proper member * signal.c (ruby_signal): should return either `old.sa_sigaction` or `old.sa_handler`, depending on whether `SA_SIGINFO` is set in `old.sa_flags`, because they may not be a union. [ruby-core:62836] [Bug #9878] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ signal.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0515a7f975..fa136d9159 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu May 29 23:27:50 2014 Rei Odaira + + * signal.c (ruby_signal): should return either `old.sa_sigaction` + or `old.sa_handler`, depending on whether `SA_SIGINFO` is set in + `old.sa_flags`, because they may not be a union. + [ruby-core:62836] [Bug #9878] + Thu May 29 23:11:20 2014 Tanaka Akira * io.c (pipe_open): Close pipes when rb_execarg_fixup() raises diff --git a/signal.c b/signal.c index 8e84db5874..75908420ef 100644 --- a/signal.c +++ b/signal.c @@ -595,7 +595,10 @@ ruby_signal(int signum, sighandler_t handler) rb_bug_errno("sigaction", errno); } } - return old.sa_handler; + if (old.sa_flags & SA_SIGINFO) + return (sighandler_t)old.sa_sigaction; + else + return old.sa_handler; } sighandler_t