From 753ec85ab53c0752a64394357aa56f11897c6abe Mon Sep 17 00:00:00 2001
From: kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 18 May 2015 21:04:33 +0000
Subject: [PATCH] 2015-05-18  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/66039
	* io.c (match_filepos): Check for incomplete/mangled REWIND, FLUSH,
	BACKSPACE, and ENDFILE statements

2015-05-18  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/66039
	* gfortran.dg/filepos1.f90: New test


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223315 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/fortran/ChangeLog                  |  6 ++++++
 gcc/fortran/io.c                       |  4 +---
 gcc/testsuite/ChangeLog                |  5 +++++
 gcc/testsuite/gfortran.dg/filepos1.f90 | 25 +++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/filepos1.f90

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6913d881b09..a5d4d22df5d 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
 2015-05-18  Steven G. Kargl  <kargl@gcc.gnu.org>
 
+	PR fortran/66039
+	* io.c (match_filepos): Check for incomplete/mangled REWIND, FLUSH,
+	BACKSPACE, and ENDFILE statements
+
+2015-05-18  Steven G. Kargl  <kargl@gcc.gnu.org>
+
 	PR fortran/64925
 	* symbol.c(check_conflict):  Check for a conflict between a dummy
 	argument and an internal procedure name.
diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index 82a0a871fd3..0ac4f4a03ad 100644
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -2382,9 +2382,7 @@ match_filepos (gfc_statement st, gfc_exec_op op)
   if (m == MATCH_NO)
     {
       m = gfc_match_expr (&fp->unit);
-      if (m == MATCH_ERROR)
-	goto done;
-      if (m == MATCH_NO)
+      if (m == MATCH_ERROR || m == MATCH_NO)
 	goto syntax;
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 593427cdbf0..3dd2d94ecec 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2015-05-18  Steven G. Kargl  <kargl@gcc.gnu.org>
 
+	PR fortran/66039
+	* gfortran.dg/filepos1.f90: New test
+
+2015-05-18  Steven G. Kargl  <kargl@gcc.gnu.org>
+
 	PR fortran/64925
 	* gfortran.dg/pr64925.f90: New test.
 
diff --git a/gcc/testsuite/gfortran.dg/filepos1.f90 b/gcc/testsuite/gfortran.dg/filepos1.f90
new file mode 100644
index 00000000000..d34902a4934
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/filepos1.f90
@@ -0,0 +1,25 @@
+! { dg-do compile }
+! PR fortran/66039
+!
+! Original code from Gerhard Steinmetz
+! <gerhard dot steinmetz dot fortran at t-online dot de>
+subroutine p1
+   rewind ((     ! { dg-error "Syntax error in REWIND" }
+   rewind (-     ! { dg-error "Syntax error in REWIND" }
+end subroutine p1
+
+subroutine p2
+   flush ((      ! { dg-error "Syntax error in FLUSH" }
+   flush (-      ! { dg-error "Syntax error in FLUSH" }
+end subroutine p2
+
+subroutine p4
+   backspace ((   ! { dg-error "Syntax error in BACKSPACE" }
+   backspace (-   ! { dg-error "Syntax error in BACKSPACE" }
+end subroutine p4
+
+subroutine p3
+   endfile ((     ! { dg-error "Expecting END SUBROUTINE" }
+   endfile (-     ! { dg-error "Expecting END SUBROUTINE" }
+end subroutine p3
+
-- 
2.11.4.GIT