shyouhei	2008-06-05 12:22:03 +0900 (Thu, 05 Jun 2008)

  New Revision: 16825

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/gc.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 13587:
    * 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_5/version.h?r1=16825&r2=16824&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16825&r2=16824&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/gc.c?r1=16825&r2=16824&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16824)
+++ ruby_1_8_5/ChangeLog	(revision 16825)
@@ -1,3 +1,8 @@
+Thu Jun  5 12:21:06 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* gc.c (id2ref): valid id should not refer T_VALUE nor T_ICLASS.
+	  [ruby-dev:31911]
+
 Wed Jun  4 16:39:56 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16824)
+++ ruby_1_8_5/version.h	(revision 16825)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2008-06-04"
+#define RUBY_RELEASE_DATE "2008-06-05"
 #define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20080604
-#define RUBY_PATCHLEVEL 126
+#define RUBY_RELEASE_CODE 20080605
+#define RUBY_PATCHLEVEL 127
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 5
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_5/gc.c
===================================================================
--- ruby_1_8_5/gc.c	(revision 16824)
+++ ruby_1_8_5/gc.c	(revision 16825)
@@ -1878,6 +1878,7 @@
     VALUE obj, objid;
 {
     unsigned long ptr, p0;
+    int type;
 
     rb_secure(4);
     p0 = ptr = NUM2ULONG(objid);
@@ -1894,7 +1895,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/