usa	2015-09-29 17:22:42 +0900 (Tue, 29 Sep 2015)

  New Revision: 51975

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

  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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/thread_pthread.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 51974)
+++ ruby_2_1/ChangeLog	(revision 51975)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Sep 29 17:20:07 2015  NARUSE, Yui  <naruse@r...>
+
+	* thread_pthread.c (reserve_stack): ensure the memory is really
+	  allocated. [Bug #11457]
+
 Tue Sep 29 17:18:40 2015  NAKAMURA Usaku  <usa@r...>
 
 	* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.8.
Index: ruby_2_1/thread_pthread.c
===================================================================
--- ruby_2_1/thread_pthread.c	(revision 51974)
+++ ruby_2_1/thread_pthread.c	(revision 51975)
@@ -681,8 +681,8 @@ reserve_stack(volatile char *limit, size https://github.com/ruby/ruby/blob/trunk/ruby_2_1/thread_pthread.c#L681
 	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_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 51974)
+++ ruby_2_1/version.h	(revision 51975)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.8"
 #define RUBY_RELEASE_DATE "2015-09-29"
-#define RUBY_PATCHLEVEL 401
+#define RUBY_PATCHLEVEL 402
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 9

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


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