usa	2014-11-19 10:20:04 +0900 (Wed, 19 Nov 2014)

  New Revision: 48491

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

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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/vm_eval.c
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 48490)
+++ ruby_2_0_0/ChangeLog	(revision 48491)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Nov 19 10:19:36 2014  Eric Wong  <e@8...>
+
+	* vm_eval.c (rb_yield_splat): add missing GC guard
+	  [Bug #10509]
+
 Thu Nov 13 22:31:50 2014  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* lib/rexml/document.rb: add REXML::Document#document.
Index: ruby_2_0_0/vm_eval.c
===================================================================
--- ruby_2_0_0/vm_eval.c	(revision 48490)
+++ ruby_2_0_0/vm_eval.c	(revision 48491)
@@ -977,6 +977,7 @@ rb_yield_splat(VALUE values) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_eval.c#L977
         rb_raise(rb_eArgError, "not an array");
     }
     v = rb_yield_0(RARRAY_LENINT(tmp), RARRAY_PTR(tmp));
+    RB_GC_GUARD(tmp);
     return v;
 }
 
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 48490)
+++ ruby_2_0_0/version.h	(revision 48491)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-11-13"
-#define RUBY_PATCHLEVEL 598
+#define RUBY_RELEASE_DATE "2014-11-19"
+#define RUBY_PATCHLEVEL 599
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 

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


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