From 7b6b435332b4978cc4404727b2ff20eb893793ed Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Wed, 18 Dec 2013 23:41:50 +0000 Subject: [PATCH] read.c (read_f): Convert assert to runtime error. 2013-12-18 Steven G. Kargl * io/read.c (read_f): Convert assert to runtime error. 2013-12-18 Steven G. Kargl * gfortran.dg/io_err_1.f90: New test. From-SVN: r206102 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gfortran.dg/io_err_1.f90 | 14 ++++++++++++++ libgfortran/ChangeLog | 4 ++++ libgfortran/io/read.c | 4 +++- 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/io_err_1.f90 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f4e055fdc89..2ba0cbf71c5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2013-12-18 Steven G. Kargl + + * gfortran.dg/io_err_1.f90: New test. + 2013-12-18 Balaji V. Iyer * c-c++-common/cilk-plus/SE/ef_test.c: New test. diff --git a/gcc/testsuite/gfortran.dg/io_err_1.f90 b/gcc/testsuite/gfortran.dg/io_err_1.f90 new file mode 100644 index 00000000000..4159a041a72 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/io_err_1.f90 @@ -0,0 +1,14 @@ +! { dg-do run } +! { dg-shouldfail "Compile-time specifier checking" } +! +! Contributed by Dominique Dhumieres +program read + character(50) :: buf='0.D99999' + double precision val + read (UNIT=buf, FMT='(D60.0)', ERR=10) Val + call abort +10 read (UNIT=buf, FMT='(D60.0)') Val +end program read +! { dg-output "At line 10 of file.*" } +! { dg-output "Fortran runtime error: Bad value during floating point read" } + diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 309712c012b..7bfb2c1242b 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,7 @@ +2013-12-18 Steven G. Kargl + + * io/read.c (read_f): Convert assert to runtime error. + 2013-12-17 Andreas Tobler * io/unix.c (tempfile_open): Only use the needed flag O_CLOEXEC. diff --git a/libgfortran/io/read.c b/libgfortran/io/read.c index e35b1a06168..f0de14c4651 100644 --- a/libgfortran/io/read.c +++ b/libgfortran/io/read.c @@ -1150,7 +1150,9 @@ done: exponent = - exponent; } - assert (exponent < 10000); + if (exponent >= 10000) + goto bad_float; + for (dig = 3; dig >= 0; --dig) { out[dig] = (char) ('0' + exponent % 10);