diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-05-11 18:58:21 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-05-11 18:58:21 +0000 |
| commit | 8132af9db3e2bf5a4f39cb48b6e3fd8f4045ec9f (patch) | |
| tree | 3c6d310ca669fc5188037f9e075a73dd7487c640 | |
| parent | b5f52fb14fd955b02b05025c424adc0dae8e61e4 (diff) | |
| download | gcc-8132af9db3e2bf5a4f39cb48b6e3fd8f4045ec9f.zip gcc-8132af9db3e2bf5a4f39cb48b6e3fd8f4045ec9f.tar.gz gcc-8132af9db3e2bf5a4f39cb48b6e3fd8f4045ec9f.tar.bz2 | |
re PR fortran/85542 (ICE in check_inquiry, at fortran/expr.c:2426)
2018-05-11 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/85542
* expr.c (check_inquiry): Avoid NULL pointer dereference.
2018-05-11 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/85542
* gfortran.dg/pr85542.f90: New test.
From-SVN: r260182
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr85542.f90 | 7 |
4 files changed, 18 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 03dbc62..e603fef 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2018-05-11 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/85542 + * expr.c (check_inquiry): Avoid NULL pointer dereference. + 2018-05-10 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/85687 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 9e113d2..e6ab822 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 90bda6e..ddcba1f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-05-11 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/85542 + * gfortran.dg/pr85542.f90: New test. + 2018-05-11 Martin Jambor <mjambor@suse.cz> PR ipa/85655 diff --git a/gcc/testsuite/gfortran.dg/pr85542.f90 b/gcc/testsuite/gfortran.dg/pr85542.f90 new file mode 100644 index 0000000..f61d2c9 --- /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 |