ruby-changes:19475
From: yugui <ko1@a...>
Date: Thu, 12 May 2011 06:26:42 +0900 (JST)
Subject: [ruby-changes:19475] Ruby:r31517 (ruby_1_9_2): merges r30894 from trunk into ruby_1_9_2.
yugui 2011-05-12 06:23:50 +0900 (Thu, 12 May 2011) New Revision: 31517 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31517 Log: merges r30894 from trunk into ruby_1_9_2. -- * compile.c (get_exception_sym2type): guard temporary object from GC. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/compile.c branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 31516) +++ ruby_1_9_2/ChangeLog (revision 31517) @@ -1,3 +1,7 @@ +Fri Feb 18 00:28:39 2011 CHIKANAGA Tomoyuki <nagachika00@g...> + + * compile.c (get_exception_sym2type): guard temporary object from GC. + Tue May 3 18:23:57 2011 Yuki Sonoda (Yugui) <yugui@y...> * test/date/test_date.rb (TestDate#test_coerce): Index: ruby_1_9_2/compile.c =================================================================== --- ruby_1_9_2/compile.c (revision 31516) +++ ruby_1_9_2/compile.c (revision 31517) @@ -5152,6 +5152,7 @@ { #undef rb_intern #define rb_intern(str) rb_intern_const(str) + VALUE sym_inspect; static VALUE symRescue, symEnsure, symRetry; static VALUE symBreak, symRedo, symNext; @@ -5170,8 +5171,9 @@ if (sym == symBreak) return CATCH_TYPE_BREAK; if (sym == symRedo) return CATCH_TYPE_REDO; if (sym == symNext) return CATCH_TYPE_NEXT; + sym_inspect = rb_inspect(sym); rb_raise(rb_eSyntaxError, "invalid exception symbol: %s", - RSTRING_PTR(rb_inspect(sym))); + RSTRING_PTR(RB_GC_GUARD(sym_inspect))); return 0; } Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 31516) +++ ruby_1_9_2/version.h (revision 31517) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 201 +#define RUBY_PATCHLEVEL 202 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/