diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-06 11:34:37 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-06 11:34:37 +0000 |
commit | e4bb7513f73ad554bfcd15108d02168a50bc5d9f (patch) | |
tree | 0480dbc29b5a214fe78c183e7f89064be75c4ad7 | |
parent | 1ba0c2594b0f5e9c9527c0da1ba90a9aa06230dc (diff) |
merge revision(s) 49463: [Backport #10814]
signal.c: SIGBUS by stack overflow on Funtoo
* signal.c (sigbus): seems that Funtoo Linux also delivers SIGBUS
at stack overflow.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | signal.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -848,7 +848,8 @@ sigbus(int sig SIGINFO_ARG) * and it's delivered as SIGBUS instead of SIGSEGV to userland. It's crazy * wrong IMHO. but anyway we have to care it. Sigh. */ -#if defined __APPLE__ + /* Seems Linux also delivers SIGBUS. */ +#if defined __APPLE__ || defined __linux__ CHECK_STACK_OVERFLOW(); #endif rb_bug_context(SIGINFO_CTX, "Bus Error" MESSAGE_FAULT_ADDRESS); @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-02-06" -#define RUBY_PATCHLEVEL 42 +#define RUBY_PATCHLEVEL 43 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 |