diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-27 08:55:19 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-27 08:55:19 +0000 |
commit | 6491028d5b64da1e0a27d9017ca00b4da8ce94a8 (patch) | |
tree | 0924347b3276603adf0138249314737fa4cff474 | |
parent | 4e057b91576ce7be07c9f76ac9ab51b6e0b1fb15 (diff) |
merge revision(s) 46233: [Backport #9878]
* 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/branches/ruby_2_0_0@46583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | signal.c | 5 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Fri Jun 27 17:54:09 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] + Fri Jun 27 17:37:12 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * vsnprintf.c (BSD_vfprintf): fix string width when precision is @@ -521,7 +521,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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-06-27" -#define RUBY_PATCHLEVEL 507 +#define RUBY_PATCHLEVEL 508 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 6 |