* io.c (fptr_finalize): must not use FILE after fclose().

  [ruby-dev:24985]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 17 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index ad800b39e..c27fbde6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 29 13:37:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (fptr_finalize): must not use FILE after fclose().
+	  [ruby-dev:24985]
+
 Mon Nov 29 13:16:31 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (CreateChild): push back the last space before next
diff --git a/io.c b/io.c
index 1cce09822..ba7f4b08e 100644
--- a/io.c
+++ b/io.c
@@ -1810,22 +1810,29 @@ fptr_finalize(fptr, noraise)
 
     if (fptr->f2) {
 	f2 = fileno(fptr->f2);
-	while (n2 = 0, fclose(fptr->f2) < 0) {
+	while (n2 = 0, fflush(fptr->f2) < 0) {
 	    n2 = errno;
 	    if (!rb_io_wait_writable(f2)) {
 		break;
 	    }
 	    if (!fptr->f2) break;
 	}
+	if (fclose(fptr->f2) < 0 && n2 == 0) {
+	    n2 = errno;
+	}
 	fptr->f2 = 0;
     }
     if (fptr->f) {
 	f1 = fileno(fptr->f);
-	while (n1 = 0, fclose(fptr->f) < 0) {
+	if ((f2 == -1) && (fptr->mode & FMODE_WBUF)) {
+	    while (n1 = 0, fflush(fptr->f) < 0) {
+		n1 = errno;
+		if (!rb_io_wait_writable(f1)) break;
+		if (!fptr->f) break;
+	    }
+	}
+	if (fclose(fptr->f) < 0 && n1 == 0) {
 	    n1 = errno;
-	    if (f2 != -1 || !(fptr->mode & FMODE_WBUF)) break;
-	    if (!rb_io_wait_writable(f1)) break;
-	    if (!fptr->f) break;
 	}
 	fptr->f = 0;
 	if (n1 == EBADF && f1 == f2) {