matz	2007-10-01 22:45:06 +0900 (Mon, 01 Oct 2007)

  New Revision: 13587

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/gc.c

  Log:
    * gc.c (id2ref): valid id should not refer T_VALUE nor T_ICLASS.
      [ruby-dev:31911]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13587&r2=13586
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/gc.c?r1=13587&r2=13586

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13586)
+++ ruby_1_8/ChangeLog	(revision 13587)
@@ -1,3 +1,8 @@
+Mon Oct  1 12:50:59 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* gc.c (id2ref): valid id should not refer T_VALUE nor T_ICLASS.
+	  [ruby-dev:31911]
+
 Wed Sep 26 23:54:37 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/extmk.rb (extmake), lib/mkmf.rb (configuration): top_srcdir
Index: ruby_1_8/gc.c
===================================================================
--- ruby_1_8/gc.c	(revision 13586)
+++ ruby_1_8/gc.c	(revision 13587)
@@ -1922,6 +1922,7 @@
     VALUE obj, objid;
 {
     unsigned long ptr, p0;
+    int type;
 
     rb_secure(4);
     p0 = ptr = NUM2ULONG(objid);
@@ -1938,7 +1939,8 @@
         return ID2SYM(symid);
     }
 
-    if (!is_pointer_to_heap((void *)ptr)|| BUILTIN_TYPE(ptr) >= T_BLKTAG) {
+    if (!is_pointer_to_heap((void *)ptr)||
+	(type = BUILTIN_TYPE(ptr)) >= T_BLKTAG || type == T_ICLASS) {
 	rb_raise(rb_eRangeError, "0x%lx is not id value", p0);
     }
     if (BUILTIN_TYPE(ptr) == 0 || RBASIC(ptr)->klass == 0) {

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