diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-29 14:27:53 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-29 14:27:53 +0000 |
commit | fad56622f7aef6ed82339852b3a4aea3cabe6430 (patch) | |
tree | 22890f3c48725602abdaa8f3405d34ddf0fa83c7 | |
parent | 52e91e0f721057d133b2020c10a3abe390fc1732 (diff) | |
download | ruby-fad56622f7aef6ed82339852b3a4aea3cabe6430.tar.gz |
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
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | signal.c | 5 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Thu May 29 23:27:50 2014 Rei Odaira <Rei.Odaira@gmail.com> + + * 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 <akr@fsij.org> * io.c (pipe_open): Close pipes when rb_execarg_fixup() raises @@ -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 |