diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2019-03-06 21:06:35 +0000 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gcc.gnu.org> | 2019-03-06 21:06:35 +0000 |
| commit | a28a8193e57ce99f8d5ae1cbf34cd6e8f490d79e (patch) | |
| tree | 323171a475fad6c48c1a4bf610f3671599d9e513 /gcc/fortran | |
| parent | 1c98301f2b8b5f1bd7a411b1bbb66cc5694688bf (diff) | |
| download | gcc-a28a8193e57ce99f8d5ae1cbf34cd6e8f490d79e.zip gcc-a28a8193e57ce99f8d5ae1cbf34cd6e8f490d79e.tar.gz gcc-a28a8193e57ce99f8d5ae1cbf34cd6e8f490d79e.tar.bz2 | |
re PR fortran/71203 (ICE in add_init_expr_to_sym, at fortran/decl.c:1512 and :1564)
2019-03-06 Harald Anlauf <anlauf@gmx.de>
PR fortran/71203
* expr.c (simplify_const_ref): Avoid null pointer dereference.
PR fortran/71203
* gfortran.dg/substr_8.f90: New test.
From-SVN: r269444
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9f42349..2b23b99 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2019-03-06 Harald Anlauf <anlauf@gmx.de> + + PR fortran/71203 + * expr.c (simplify_const_ref): Avoid null pointer dereference. + 2019-03-03 Harald Anlauf <anlauf@gmx.de> Steven G. Kargl <kargl@gcc.gnu.org> diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index c3d78d3..51552a7 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1897,8 +1897,14 @@ simplify_const_ref (gfc_expr *p) string_len = 0; if (!p->ts.u.cl) - p->ts.u.cl = gfc_new_charlen (p->symtree->n.sym->ns, - NULL); + { + if (p->symtree) + p->ts.u.cl = gfc_new_charlen (p->symtree->n.sym->ns, + NULL); + else + p->ts.u.cl = gfc_new_charlen (gfc_current_ns, + NULL); + } else gfc_free_expr (p->ts.u.cl->length); |