nagachika	2015-02-18 00:21:12 +0900 (Wed, 18 Feb 2015)

  New Revision: 49630

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

  Log:
    merge revision(s) r48417: [Backport #10509]
    
    * vm_eval.c (rb_yield_splat): add missing GC guard
      [Bug #10509]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/version.h
    branches/ruby_2_1/vm_eval.c
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49629)
+++ ruby_2_1/ChangeLog	(revision 49630)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Feb 18 00:20:36 2015  Eric Wong  <e@8...>
+
+	* vm_eval.c (rb_yield_splat): add missing GC guard
+	  [Bug #10509]
+
 Wed Feb 18 00:18:12 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with
Index: ruby_2_1/vm_eval.c
===================================================================
--- ruby_2_1/vm_eval.c	(revision 49629)
+++ ruby_2_1/vm_eval.c	(revision 49630)
@@ -986,6 +986,7 @@ rb_yield_splat(VALUE values) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/vm_eval.c#L986
         rb_raise(rb_eArgError, "not an array");
     }
     v = rb_yield_0(RARRAY_LENINT(tmp), RARRAY_CONST_PTR(tmp));
+    RB_GC_GUARD(tmp);
     return v;
 }
 
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49629)
+++ ruby_2_1/version.h	(revision 49630)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-02-18"
-#define RUBY_PATCHLEVEL 295
+#define RUBY_PATCHLEVEL 296
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2

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


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