diff --git a/ChangeLog b/ChangeLog index 8ac2bf1d1e..a511efc0ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 26 22:28:49 2011 CHIKANAGA Tomoyuki + + * vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate + variable from GC. [Bug #4322] [ruby-dev:43108] + Wed Jan 26 10:36:28 2011 NARUSE, Yui * string.c (=~): documentation fix; the return value is nil when diff --git a/version.h b/version.h index 3cf2e615c3..706df0f4fe 100644 --- a/version.h +++ b/version.h @@ -1,13 +1,13 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 174 +#define RUBY_PATCHLEVEL 175 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2011 -#define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 28 -#define RUBY_RELEASE_DATE "2011-01-28" +#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_DATE "2011-02-18" #include "ruby/version.h" diff --git a/vm_eval.c b/vm_eval.c index b0718ab5f3..0afbd285d9 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1437,6 +1437,7 @@ rb_throw_obj(VALUE tag, VALUE value) } if (!tt) { VALUE desc = rb_inspect(tag); + RB_GC_GUARD(desc); rb_raise(rb_eArgError, "uncaught throw %s", RSTRING_PTR(desc)); } rb_trap_restore_mask();