merge revision(s) r47683: [Backport ruby#10281]

nagachika · nagachika · commit c8ec78cb09e7 · 2014-09-23T17:18:59.000Z
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_1@47701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/array.c b/array.c
@@ -1585,6 +1585,7 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
 	    MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_CONST_PTR(rpl), VALUE, rlen);
 	}
     }
+    RB_GC_GUARD(rpl);
 }
 
 void
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #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

Original file line number	Diff line number	Diff line change
`@@ -1585,6 +1585,7 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)`
`1585`	`1585`	`MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_CONST_PTR(rpl), VALUE, rlen);`
`1586`	`1586`	`}`
`1587`	`1587`	`}`
	`1588`	`+ RB_GC_GUARD(rpl);`
`1588`	`1589`	`}`
`1589`	`1590`
`1590`	`1591`	`void`