merge revision(s) 13587:

shyouhei · shyouhei · commit 545ebecb30dc · 2008-06-05T03:22:03.000Z
* gc.c (id2ref): valid id should not refer T_VALUE nor T_ICLASS.
	  [ruby-dev:31911]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun  5 12:21:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
diff --git a/gc.c b/gc.c
@@ -1878,6 +1878,7 @@ id2ref(obj, objid)
     VALUE obj, objid;
 {
     unsigned long ptr, p0;
+    int type;
 
     rb_secure(4);
     p0 = ptr = NUM2ULONG(objid);
@@ -1894,7 +1895,8 @@ id2ref(obj, objid)
         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) {
diff --git a/version.h b/version.h
@@ -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[];

Original file line number	Diff line number	Diff line change
`@@ -1878,6 +1878,7 @@ id2ref(obj, objid)`
`1878`	`1878`	`VALUE obj, objid;`
`1879`	`1879`	`{`
`1880`	`1880`	`unsigned long ptr, p0;`
	`1881`	`+ int type;`
`1881`	`1882`
`1882`	`1883`	`rb_secure(4);`
`1883`	`1884`	`p0 = ptr = NUM2ULONG(objid);`
`@@ -1894,7 +1895,8 @@ id2ref(obj, objid)`
`1894`	`1895`	`return ID2SYM(symid);`
`1895`	`1896`	`}`
`1896`	`1897`
`1897`		`- if (!is_pointer_to_heap((void *)ptr)\|\| BUILTIN_TYPE(ptr) >= T_BLKTAG) {`
	`1898`	`+ if (!is_pointer_to_heap((void *)ptr)\|\|`
	`1899`	`+ (type = BUILTIN_TYPE(ptr)) >= T_BLKTAG \|\| type == T_ICLASS) {`
`1898`	`1900`	`rb_raise(rb_eRangeError, "0x%lx is not id value", p0);`
`1899`	`1901`	`}`
`1900`	`1902`	`if (BUILTIN_TYPE(ptr) == 0 \|\| RBASIC(ptr)->klass == 0) {`