From: kargl Date: Wed, 13 Jun 2018 19:37:50 +0000 (+0000) Subject: 2018-06-13 Steven G. Kargl X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f61fa2ece67e406695f873e006f46700bcbd2257;p=thirdparty%2Fgcc.git 2018-06-13 Steven G. Kargl PR fortran/86110 * array.c (gfc_resolve_character_array_constructor): Avoid NULL pointer dereference. 2018-06-13 Steven G. Kargl PR fortran/86110 * gfortran.dg/pr86110.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261561 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 25b5f37de551..05397b92dfa9 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-06-13 Steven G. Kargl + + PR fortran/86110 + * array.c (gfc_resolve_character_array_constructor): Avoid NULL + pointer dereference. + 2018-06-13 Cesar Philippidis PR fortran/85703 diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index 031ab7643a5d..e4926d751471 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 c56ef09f7269..0797df7ea5f6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-06-13 Steven G. Kargl + + PR fortran/86110 + * gfortran.dg/pr86110.f90: New test. + 2018-06-13 Cesar Philippidis PR fortran/85703 diff --git a/gcc/testsuite/gfortran.dg/pr86110.f90 b/gcc/testsuite/gfortran.dg/pr86110.f90 new file mode 100644 index 000000000000..890670f5854d --- /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