diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | thread_pthread.c | 2 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Sep 30 03:24:29 2015 NARUSE, Yui <naruse@ruby-lang.org> + + * thread_pthread.c (reserve_stack): ensure the memory is really + allocated. [Bug #11457] + Tue Aug 25 01:01:01 2015 Koichi Sasada <ko1@atdot.net> * insns.def (defineclass): introduce an ad-hoc patch to avoid diff --git a/thread_pthread.c b/thread_pthread.c index 5fcad19ebd..2a47efedd3 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -686,8 +686,8 @@ reserve_stack(volatile char *limit, size_t size) limit -= size; if (buf > limit) { limit = alloca(buf - limit); + limit[0] = 0; /* ensure alloca is called */ limit -= stack_check_margin; - limit[0] = 0; } } } @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.4" -#define RUBY_RELEASE_DATE "2015-08-25" -#define RUBY_PATCHLEVEL 175 +#define RUBY_RELEASE_DATE "2015-09-30" +#define RUBY_PATCHLEVEL 176 #define RUBY_RELEASE_YEAR 2015 -#define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_MONTH 9 +#define RUBY_RELEASE_DAY 30 #include "ruby/version.h" |