[ruby-dev:25245] Re: Dir.foreach dumps core

前田です。

Tanaka Akira wrote:
> 次のようにすると core を吐きます。
> 
> % ./ruby -e '
> def Dir.open(dirname) Time.now end
> Dir.foreach(".")
> '
> -e:3: [BUG] Segmentation fault
> ruby 1.9.0 (2004-12-17) [i686-linux]

名前が今一つかもしれませんが、こんなマクロを用意してはどうでしょうか。

Index: ruby.h
===================================================================
RCS file: /var/cvs/src/ruby/ruby.h,v
retrieving revision 1.109
diff -u -r1.109 ruby.h
--- ruby.h	17 Nov 2004 02:27:36 -0000	1.109
+++ ruby.h	17 Dec 2004 15:55:39 -0000
@@ -396,6 +396,16 @@
     sval = (type*)DATA_PTR(obj);\
 } while (0)

+#define Data_Get_Exact_Struct(obj,type,sval,mark,free,klass) do {\
+    if (TYPE(obj) != T_DATA ||\
+	RDATA(obj)->dmark != (RUBY_DATA_FUNC)mark ||\
+	RDATA(obj)->dfree != (RUBY_DATA_FUNC)free) {\
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",\
+		 rb_obj_classname(obj), klass);\
+    }\
+    sval = (type*)DATA_PTR(obj);\
+} while (0)
+
 struct RStruct {
     struct RBasic basic;
     long len;
Index: dir.c
===================================================================
RCS file: /var/cvs/src/ruby/dir.c,v
retrieving revision 1.135
diff -u -r1.135 dir.c
--- dir.c	7 Dec 2004 04:45:45 -0000	1.135
+++ dir.c	17 Dec 2004 15:55:40 -0000
@@ -439,7 +439,7 @@
 }

 #define GetDIR(obj, dirp) do {\
-    Data_Get_Struct(obj, struct dir_data, dirp);\
+    Data_Get_Exact_Struct(obj, struct dir_data, dirp, 0, free_dir, "Dir");\
     if (dirp->dir == NULL) dir_closed();\
 } while (0)

-- 
前田 修吾