re PR libfortran/19451 (Read after a write with a read only file)

2005-01-22  Thomas Koenig  <Thomas.Koenig@online.de>

	PR libfortran/19451
	* io/transfer.c (finalize_transfer):  Don't do anything if
	there is an error condition.
	* open_readonly_1.f90:  New test.

From-SVN: r94101

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b39fb693f0c71c584c508b18c3ffa1c6c5d6e425..f63c8dba206014efd868c4e4b08d916de1e0bec5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-22  Thomas Koenig  <Thomas.Koenig@online.de>
+
+       PR libfortran/19451
+       * open_readonly_1.f90:  New test.
+
 2005-01-22  Thomas Koenig  <Thomas.Koenig@online.de>
 
        PR libfortran/18982

diff --git a/gcc/testsuite/gfortran.dg/open_readonly_1.f90 b/gcc/testsuite/gfortran.dg/open_readonly_1.f90
new file mode 100644 (file)
index 0000000..622a07d
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/open_readonly_1.f90
@@ -0,0 +1,14 @@
+! { dg-do run }
+! PR19451
+! Writing to a non-empty readonly file caused a segfault.
+! We were still trying to write the EOR after an error ocurred
+program prog
+  open (unit=10, file='PR19451.dat')
+  write (10,*) "Hello World"
+  close (10)
+  open (unit=10, file='PR19451.dat', action="read")
+  write (10,*,err=20) "Hello World"
+  call abort()
+  20 continue
+end program
+

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index c2218fba7179f20167d8321404635d8c89a318fd..1296ab2a2475e61b7bd2232b8868cb2cc15e3f6c 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-22  Thomas Koenig  <Thomas.Koenig@online.de>
+
+       PR libfortran/19451
+       * io/transfer.c (finalize_transfer):  Don't do anything if
+       there is an error condition.
+
 2005-01-22  David Edelsohn  <edelsohn@gnu.org>
 
        PR libgfortran/19052

diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 114ed92abb951b2d28208aff727e99a884e00112..1dcbc7ff74c8941c3a1c634605ac2721c2a08588 100644 (file)
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -1389,6 +1389,9 @@ next_record (int done)
 static void
 finalize_transfer (void)
 {
+  if (ioparm.library_return != LIBRARY_OK)
+    return;
+
   if ((ionml != NULL) && (ioparm.namelist_name != NULL))
     {
        if (ioparm.namelist_read_mode)