summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--version.h6
-rw-r--r--vm_eval.c1
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 02ae4869e0..54bf2d52fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 19 10:19:36 2014 Eric Wong <e@80x24.org>
+
+ * vm_eval.c (rb_yield_splat): add missing GC guard
+ [Bug #10509]
+
Thu Nov 13 22:31:50 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* lib/rexml/document.rb: add REXML::Document#document.
diff --git a/version.h b/version.h
index b7876f780b..1b64539524 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#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"
diff --git a/vm_eval.c b/vm_eval.c
index 13030377be..c0334bf365 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -977,6 +977,7 @@ rb_yield_splat(VALUE values)
rb_raise(rb_eArgError, "not an array");
}
v = rb_yield_0(RARRAY_LENINT(tmp), RARRAY_PTR(tmp));
+ RB_GC_GUARD(tmp);
return v;
}