diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-04-24 23:17:29 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-04-24 23:17:29 +0000 |
| commit | 58da192e7a35ed16e23d5a33246d68fae3d1a1dc (patch) | |
| tree | 5fc084040ddbfbf1950f194b1e97005353888bae /gcc | |
| parent | 08417efa3ad973ba7b1be5b6a530e0b186e3c294 (diff) | |
| download | gcc-58da192e7a35ed16e23d5a33246d68fae3d1a1dc.zip gcc-58da192e7a35ed16e23d5a33246d68fae3d1a1dc.tar.gz gcc-58da192e7a35ed16e23d5a33246d68fae3d1a1dc.tar.bz2 | |
re PR fortran/85520 (Out of memory when declaring a character with len << 0)
2018-04-24 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/85520
* decl.c (gfc_match_char_spec): Check for negative length and set to 0.
2018-04-24 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/85520
* gfortran.dg/pr85520.f90: New test.
From-SVN: r259623
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr85520.f90 | 7 |
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9d12686..46c234f 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2018-04-24 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/85520 + * decl.c (gfc_match_char_spec): Check for negative length and set to 0. + 2018-04-14 Andre Vehreschild <vehre@gcc.gnu.org> PR fortran/81773 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 192910d..d1b75cc 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -3235,7 +3235,11 @@ done: e = gfc_copy_expr (len); gfc_reduce_init_expr (e); if (e->expr_type == EXPR_CONSTANT) - gfc_replace_expr (len, e); + { + gfc_replace_expr (len, e); + if (mpz_cmp_si (len->value.integer, 0) < 0) + mpz_set_ui (len->value.integer, 0); + } else gfc_free_expr (e); cl->length = len; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ff4b5fb..6ba8fed 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-04-24 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/85520 + * gfortran.dg/pr85520.f90: New test. + 2018-04-24 Kyrylo Tkachov <kyrylo.tkachov@arm.com> PR target/85512 diff --git a/gcc/testsuite/gfortran.dg/pr85520.f90 b/gcc/testsuite/gfortran.dg/pr85520.f90 new file mode 100644 index 0000000..3e66a90 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr85520.f90 @@ -0,0 +1,7 @@ +! { dg-do run } +! PR fortran/85520 +! Original code from Gerhard Steinmetz <gscfq at t-online dot de> +program p + character(-huge(1)) :: c = ' ' + if (len(c) /= 0) stop 1 +end |