From a6a9db020c47a9a457c541e25962b102be8f2871 Mon Sep 17 00:00:00 2001 From: kargl Date: Fri, 11 May 2018 18:58:21 +0000 Subject: [PATCH] 2018-05-11 Steven G. Kargl PR fortran/85542 * expr.c (check_inquiry): Avoid NULL pointer dereference. 2018-05-11 Steven G. Kargl PR fortran/85542 * gfortran.dg/pr85542.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@260182 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/expr.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/pr85542.f90 | 7 +++++++ 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr85542.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 03dbc626c92..e603fef4f3f 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2018-05-11 Steven G. Kargl + + PR fortran/85542 + * expr.c (check_inquiry): Avoid NULL pointer dereference. + 2018-05-10 Steven G. Kargl PR fortran/85687 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 9e113d26a59..e6ab82272f1 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -2422,7 +2422,7 @@ check_inquiry (gfc_expr *e, int not_restricted) /* Assumed character length will not reduce to a constant expression with LEN, as required by the standard. */ - if (i == 5 && not_restricted + if (i == 5 && not_restricted && ap->expr->symtree && ap->expr->symtree->n.sym->ts.type == BT_CHARACTER && (ap->expr->symtree->n.sym->ts.u.cl->length == NULL || ap->expr->symtree->n.sym->ts.deferred)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 90bda6e9507..ddcba1fd220 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-05-11 Steven G. Kargl + + PR fortran/85542 + * gfortran.dg/pr85542.f90: New test. + 2018-05-11 Martin Jambor PR ipa/85655 diff --git a/gcc/testsuite/gfortran.dg/pr85542.f90 b/gcc/testsuite/gfortran.dg/pr85542.f90 new file mode 100644 index 00000000000..f61d2c9beb0 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr85542.f90 @@ -0,0 +1,7 @@ +! { dg-do compile } +! PR fortran/85542 +function f(x) + character(*), intent(in) :: x + character((len((x)))) :: f + f = x +end -- 2.11.4.GIT