yugui	2011-05-12 06:23:55 +0900 (Thu, 12 May 2011)

  New Revision: 31518

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

  Log:
    merges r30916 from trunk into ruby_1_9_2.
    --
     * vm_insnhelper.c (vm_check_if_namespace): guard temporary object
       from GC.

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

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31517)
+++ ruby_1_9_2/ChangeLog	(revision 31518)
@@ -1,3 +1,8 @@
+Sat Feb 19 22:37:42 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* vm_insnhelper.c (vm_check_if_namespace): guard temporary object
+	  from GC.
+
 Fri Feb 18 00:28:39 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
 
 	* compile.c (get_exception_sym2type): guard temporary object from GC.
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31517)
+++ ruby_1_9_2/version.h	(revision 31518)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 202
+#define RUBY_PATCHLEVEL 203
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/vm_insnhelper.c
===================================================================
--- ruby_1_9_2/vm_insnhelper.c	(revision 31517)
+++ ruby_1_9_2/vm_insnhelper.c	(revision 31518)
@@ -1134,13 +1134,15 @@
 static inline void
 vm_check_if_namespace(VALUE klass)
 {
+    VALUE str;
     switch (TYPE(klass)) {
       case T_CLASS:
       case T_MODULE:
 	break;
       default:
+	str = rb_inspect(klass);
 	rb_raise(rb_eTypeError, "%s is not a class/module",
-		 RSTRING_PTR(rb_inspect(klass)));
+		 RSTRING_PTR(RB_GC_GUARD(str)));
     }
 }
 

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