[ruby-dev:12864] Re: recursive malloc / fork deadlock / thread deadlock

In message <[e-mail]>,
 `GOTOU Yuuzou <[e-mail]>' wrote:
> ごとうゆうぞうです。

> 添付の修正で、malloc の再入は起きなくなったみたいです。

さっきのパッチには肝心の fdopen の修正が抜けてました(__;;
popen の修正の影響は確認していません。

--
ごとうゆうぞう

diff -u ruby/io.c ruby.local/io.c
--- ruby/io.c	Wed Apr 11 04:40:12 2001
+++ ruby.local/io.c	Wed Apr 11 05:38:58 2001
@@ -1379,6 +1379,8 @@
 	    rb_sys_fail(fname);
 	}
     }
+    if (setvbuf(file, NULL, _IOFBF, 0) == EOF) rb_sys_fail(fname);
+
 #ifdef __human68k__
     fmode(file, _IOTEXT);
 #endif
@@ -1402,6 +1404,8 @@
 	    rb_sys_fail(0);
 	}
     }
+    if (setvbuf(file, NULL, _IOFBF, 0) == EOF) rb_sys_fail(0);
+
     return file;
 }
 
@@ -1567,7 +1571,7 @@
 #if defined(NT) || defined(DJGPP) || defined(__human68k__)
     FILE *f = popen(pname, mode);
 
-    if (!f) rb_sys_fail(pname);
+    if (!f || setvbuf(file, NULL, _IOFBF, 0) == EOF) rb_sys_fail(pname);
     else {
 	NEWOBJ(port, struct RFile);
 	OBJSETUP(port, rb_cIO, T_FILE);
@@ -1922,11 +1926,13 @@
 	return file;
     }
 
-    if (freopen(RSTRING(fname)->ptr, mode, fptr->f) == 0) {
+    if (freopen(RSTRING(fname)->ptr, mode, fptr->f) == 0 ||
+	setvbuf(fptr->f, NULL, _IOFBF, 0) == EOF){
 	rb_sys_fail(fptr->path);
     }
     if (fptr->f2) {
-	if (freopen(RSTRING(fname)->ptr, "w", fptr->f2) == 0) {
+	if (freopen(RSTRING(fname)->ptr, "w", fptr->f2) == 0 ||
+	    setvbuf(fptr->f, NULL, _IOFBF, 0) == EOF){
 	    rb_sys_fail(fptr->path);
 	}
     }
diff -u ruby/ruby.c ruby.local/ruby.c
--- ruby/ruby.c	Wed Apr 11 04:40:12 2001
+++ ruby.local/ruby.c	Wed Apr 11 04:58:18 2001
@@ -733,7 +733,7 @@
     else {
 	FILE *fp = fopen(fname, "r");
 
-	if (fp == NULL) {
+	if (fp == NULL || setvbuf(fp, NULL, _IOFBF, 0) == EOF){
 	    rb_load_fail(fname);
 	}
 	fclose(fp);