yugui	2011-02-18 19:43:34 +0900 (Fri, 18 Feb 2011)

  New Revision: 30897

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30897

  Log:
    merges r30657 from trunk into ruby_1_9_2.
    --
    * vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate
      variable from GC. [Bug #4322] [ruby-dev:43108]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/version.h
    branches/ruby_1_9_2/vm_eval.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30896)
+++ ruby_1_9_2/ChangeLog	(revision 30897)
@@ -1,3 +1,8 @@
+Wed Jan 26 22:28:49 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* 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  <naruse@r...>
 
 	* string.c (=~): documentation fix; the return value is nil when
Index: ruby_1_9_2/vm_eval.c
===================================================================
--- ruby_1_9_2/vm_eval.c	(revision 30896)
+++ ruby_1_9_2/vm_eval.c	(revision 30897)
@@ -1437,6 +1437,7 @@
     }
     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();
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30896)
+++ ruby_1_9_2/version.h	(revision 30897)
@@ -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"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/