nagachika	2014-09-24 02:18:59 +0900 (Wed, 24 Sep 2014)

  New Revision: 47701

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

  Log:
    merge revision(s) r47683: [Backport #10281]
    
    array.c: GC guard
    
    * array.c (rb_ary_splice): prevent replacing array from GC.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/array.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/array.c
===================================================================
--- ruby_2_1/array.c	(revision 47700)
+++ ruby_2_1/array.c	(revision 47701)
@@ -1585,6 +1585,7 @@ rb_ary_splice(VALUE ary, long beg, long https://github.com/ruby/ruby/blob/trunk/ruby_2_1/array.c#L1585
 	    MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_CONST_PTR(rpl), VALUE, rlen);
 	}
     }
+    RB_GC_GUARD(rpl);
 }
 
 void
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47700)
+++ ruby_2_1/version.h	(revision 47701)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.4"
 #define RUBY_RELEASE_DATE "2014-09-24"
-#define RUBY_PATCHLEVEL 244
+#define RUBY_PATCHLEVEL 245
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9

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


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