diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-15 06:55:27 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-15 06:55:27 +0000 |
commit | 172cc121b9d8308306167515cf97df48cbac637a (patch) | |
tree | a9d41dbb0d91ce1db0928c90e6423838b1b286b1 | |
parent | 9c7e5a85d1f51467061864363eab243ae32699ac (diff) |
merge revision(s) 47683: [Backport #10281]
array.c: GC guard
* array.c (rb_ary_splice): prevent replacing array from GC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | array.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1471,6 +1471,7 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl) MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen); } } + RB_GC_GUARD(rpl); } void @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-10-15" -#define RUBY_PATCHLEVEL 577 +#define RUBY_PATCHLEVEL 578 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 10 |