merge revision(s) r47891: [Backport #10373]

	proc.c: method body GC guard

	* proc.c (rb_mod_define_method): guard method body to prevent its
  method entry from GC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 2 insertions, 1 deletions

diff --git a/proc.c b/proc.c
index cc4e71080c..e5b6e5313d 100644
--- a/proc.c
+++ b/proc.c
@@ -1666,6 +1666,7 @@ rb_mod_define_method(int argc, VALUE *argv, VALUE mod)
 	if (noex == NOEX_MODFUNC) {
 	    rb_method_entry_set(rb_singleton_class(mod), id, method->me, NOEX_PUBLIC);
 	}
+	RB_GC_GUARD(body);
     }
     else if (rb_obj_is_proc(body)) {
 	rb_proc_t *proc;
diff --git a/version.h b/version.h
index 988ccb7b16..1ce6b38ab5 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.4"
 #define RUBY_RELEASE_DATE "2014-10-15"
-#define RUBY_PATCHLEVEL 250
+#define RUBY_PATCHLEVEL 251
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 10