summaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorJerry DeLisle <jvdelisle@gcc.gnu.org>2010-03-26 03:23:34 +0000
committerJerry DeLisle <jvdelisle@gcc.gnu.org>2010-03-26 03:23:34 +0000
commit6a10835a6b0b01a29cbbb28b0ccdaac21103e98d (patch)
tree9c85157c36a8ce6432af0d680f0cf9c2d2fe74e5 /libgfortran
parent5dc22714565caf136771deefa4e59a0fa9967750 (diff)
downloadgcc-6a10835a6b0b01a29cbbb28b0ccdaac21103e98d.tar.gz
re PR fortran/43517 (spurious end-of-file condition when namelist read follows formatted read)
2010-03-25 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR libfortran/43517 * io/read.c (read_x): Return if seen EOR condition. From-SVN: r157737
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog5
-rw-r--r--libgfortran/io/read.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index d4d6b9f1703..b13f107f736 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-25 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+
+ PR libfortran/43517
+ * io/read.c (read_x): Return if seen EOR condition.
+
2010-03-21 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/43409
diff --git a/libgfortran/io/read.c b/libgfortran/io/read.c
index 078c6e25fc8..cc906b97693 100644
--- a/libgfortran/io/read.c
+++ b/libgfortran/io/read.c
@@ -1046,6 +1046,9 @@ read_x (st_parameter_dt *dtp, int n)
goto done;
}
+ if (dtp->u.p.sf_seen_eor)
+ return;
+
p = fbuf_read (dtp->u.p.current_unit, &length);
if (p == NULL)
{