ruby-changes:35853
From: usa <ko1@a...>
Date: Wed, 15 Oct 2014 16:16:20 +0900 (JST)
Subject: [ruby-changes:35853] usa:r47935 (ruby_2_0_0): merge revision(s) 47891: [Backport #10373]
usa 2014-10-15 16:16:00 +0900 (Wed, 15 Oct 2014) New Revision: 47935 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47935 Log: merge revision(s) 47891: [Backport #10373] proc.c: method body GC guard * proc.c (rb_mod_define_method): guard method body to prevent its method entry from GC. Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/proc.c branches/ruby_2_0_0/version.h Index: ruby_2_0_0/proc.c =================================================================== --- ruby_2_0_0/proc.c (revision 47934) +++ ruby_2_0_0/proc.c (revision 47935) @@ -1392,6 +1392,7 @@ rb_mod_define_method(int argc, VALUE *ar https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/proc.c#L1392 } } rb_method_entry_set(mod, id, method->me, noex); + RB_GC_GUARD(body); } else if (rb_obj_is_proc(body)) { rb_proc_t *proc; Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 47934) +++ ruby_2_0_0/version.h (revision 47935) @@ -1,6 +1,6 @@ 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-10-15" -#define RUBY_PATCHLEVEL 582 +#define RUBY_PATCHLEVEL 583 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 10 Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r47891 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/