nagachika	2015-09-30 03:32:49 +0900 (Wed, 30 Sep 2015)

  New Revision: 51985

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51985

  Log:
    merge revision(s) 51626: [Backport #11457]
    
    * thread_pthread.c (reserve_stack): ensure the memory is really
      allocated. [Bug #11457]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/thread_pthread.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 51984)
+++ ruby_2_2/ChangeLog	(revision 51985)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Sep 30 03:24:29 2015  NARUSE, Yui  <naruse@r...>
+
+	* thread_pthread.c (reserve_stack): ensure the memory is really
+	  allocated. [Bug #11457]
+
 Tue Aug 25 01:01:01 2015  Koichi Sasada <ko1@a...>
 
 	* insns.def (defineclass): introduce an ad-hoc patch to avoid
Index: ruby_2_2/thread_pthread.c
===================================================================
--- ruby_2_2/thread_pthread.c	(revision 51984)
+++ ruby_2_2/thread_pthread.c	(revision 51985)
@@ -686,8 +686,8 @@ reserve_stack(volatile char *limit, size https://github.com/ruby/ruby/blob/trunk/ruby_2_2/thread_pthread.c#L686
 	limit -= size;
 	if (buf > limit) {
 	    limit = alloca(buf - limit);
+	    limit[0] = 0; /* ensure alloca is called */
 	    limit -= stack_check_margin;
-	    limit[0] = 0;
 	}
     }
 }
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 51984)
+++ ruby_2_2/version.h	(revision 51985)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r51626


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/