diff options
author | Harald Anlauf <anlauf@gmx.de> | 2018-01-17 23:50:02 +0000 |
---|---|---|
committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-01-17 23:50:02 +0000 |
commit | c004a3413e7acc17ec620b8263ccc06922f7d61b (patch) | |
tree | 3814ca51281a66a8a307dbbad3f8be22add2f6cf /gcc/fortran | |
parent | cfb14840b842698f12ad82ab42ed4b8445af8992 (diff) | |
download | gcc-c004a3413e7acc17ec620b8263ccc06922f7d61b.zip gcc-c004a3413e7acc17ec620b8263ccc06922f7d61b.tar.gz gcc-c004a3413e7acc17ec620b8263ccc06922f7d61b.tar.bz2 |
re PR fortran/83874 (ICE initializing character array from derived type)
2018-01-17 Harald Anlauf <anlauf@gmx.de>
PR fortran/83874
* decl.c (add_init_expr_to_sym): Do not dereference NULL pointer.
2018-01-17 Harald Anlauf <anlauf@gmx.de>
PR fortran/83874
* gfortran.dg/pr83874.f90: New test.
From-SVN: r256824
Diffstat (limited to 'gcc/fortran')
-rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/fortran/decl.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0806ecd..3052533 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2018-01-17 Harald Anlauf <anlauf@gmx.de> + + PR fortran/83874 + * decl.c (add_init_expr_to_sym): Do not dereference NULL pointer. + 2018-01-15 Louis Krupp <louis.krupp@zoho.com> PR fortran/82257 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index cb23534..9d8fbe9 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1718,7 +1718,7 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus) } else if (init->expr_type == EXPR_ARRAY) { - if (init->ts.u.cl) + if (init->ts.u.cl && init->ts.u.cl->length) { const gfc_expr *length = init->ts.u.cl->length; if (length->expr_type != EXPR_CONSTANT) |