diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2018-01-14 17:36:29 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2018-01-14 17:36:29 +0000 |
| commit | 33b2b069c16e53592936095575852e3fe7b43ec3 (patch) | |
| tree | 56e6600d935c8537f8408bd9db589bd479cc5a07 | |
| parent | a61bac1ea9a971fa76a7c3770da13638e3839592 (diff) | |
| download | gcc-33b2b069c16e53592936095575852e3fe7b43ec3.zip gcc-33b2b069c16e53592936095575852e3fe7b43ec3.tar.gz gcc-33b2b069c16e53592936095575852e3fe7b43ec3.tar.bz2 | |
re PR libfortran/83811 (fortran 'e' format broken for single digit exponents)
2018-01-18 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/83811
* write.c (select_buffer): Adjust buffer size up by 1.
* gfortran.dg/fmt_e.f90: New test.
From-SVN: r256669
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/fmt_e.f90 | 10 | ||||
| -rw-r--r-- | libgfortran/ChangeLog | 5 | ||||
| -rw-r--r-- | libgfortran/io/write.c | 5 |
4 files changed, 23 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 143d59c..dfc1345 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-01-18 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR libgfortran/83811 + * gfortran.dg/fmt_e.f90: New test. + 2018-01-14 H.J. Lu <hongjiu.lu@intel.com> * gcc.target/i386/indirect-thunk-10.c: New test. diff --git a/gcc/testsuite/gfortran.dg/fmt_e.f90 b/gcc/testsuite/gfortran.dg/fmt_e.f90 new file mode 100644 index 0000000..a85506b --- /dev/null +++ b/gcc/testsuite/gfortran.dg/fmt_e.f90 @@ -0,0 +1,10 @@ +! { dg-do run } +! PR83811 fortran 'e' format broken for single digit exponents +program test + character(25) :: s + write(s, '(1pe5.0e1)') 1.e-4 + if (s.ne."1.E-4") call abort + write(s, '(e5.1e1)') 1.e12 + if (s.ne."*****") call abort +end + diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 022725f..d86151b 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2018-01-18 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + PR libgfortran/83811 + * write.c (select_buffer): Adjust buffer size up by 1. + 2018-01-08 Janne Blomqvist <jb@gcc.gnu.org> PR 78534, bugfix for r256322 diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index 8021a1e..28ea852 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -1519,8 +1519,9 @@ select_buffer (st_parameter_dt *dtp, const fnode *f, int precision, { char *result; - /* The buffer needs at least one more byte to allow room for normalizing. */ - *size = size_from_kind (dtp, f, kind) + precision + 1; + /* The buffer needs at least one more byte to allow room for + normalizing and 1 to hold null terminator. */ + *size = size_from_kind (dtp, f, kind) + precision + 1 + 1; if (*size > BUF_STACK_SZ) result = xmalloc (*size); |