diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-06-13 19:37:50 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-06-13 19:37:50 +0000 |
| commit | 010b9a3ec010d3cf5c76ba98e9a6438ad5bf7a76 (patch) | |
| tree | 08e2c886a4310e1d07af582d4702c9e39e01184a | |
| parent | de001ec7773be17f0fc44e3d7a6e64b8fee40581 (diff) | |
| download | gcc-010b9a3ec010d3cf5c76ba98e9a6438ad5bf7a76.zip gcc-010b9a3ec010d3cf5c76ba98e9a6438ad5bf7a76.tar.gz gcc-010b9a3ec010d3cf5c76ba98e9a6438ad5bf7a76.tar.bz2 | |
re PR fortran/86110 (ICE in gfc_resolve_character_array_constructor, at fortran/array.c:2044)
2018-06-13 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/86110
* array.c (gfc_resolve_character_array_constructor): Avoid NULL
pointer dereference.
2018-06-13 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/86110
* gfortran.dg/pr86110.f90: New test.
From-SVN: r261561
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/array.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr86110.f90 | 7 |
4 files changed, 20 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 25b5f37..05397b9 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-06-13 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/86110 + * array.c (gfc_resolve_character_array_constructor): Avoid NULL + pointer dereference. + 2018-06-13 Cesar Philippidis <cesar@codesourcery.com> PR fortran/85703 diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index 031ab76..e4926d7 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -2040,7 +2040,9 @@ got_charlen: gfc_ref *ref; for (ref = p->expr->ref; ref; ref = ref->next) if (ref->type == REF_SUBSTRING + && ref->u.ss.start && ref->u.ss.start->expr_type == EXPR_CONSTANT + && ref->u.ss.end && ref->u.ss.end->expr_type == EXPR_CONSTANT) break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c56ef09..0797df7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-06-13 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/86110 + * gfortran.dg/pr86110.f90: New test. + 2018-06-13 Cesar Philippidis <cesar@codesourcery.com> PR fortran/85703 diff --git a/gcc/testsuite/gfortran.dg/pr86110.f90 b/gcc/testsuite/gfortran.dg/pr86110.f90 new file mode 100644 index 0000000..890670f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr86110.f90 @@ -0,0 +1,7 @@ +! { dg-do compile } +! PR fortran/86110 +program p + character(:), allocatable :: x, y + x = 'abc' + y = [x(:)] ! { dg-error "Incompatible ranks 0 and 1" } +end |