aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/expr.c
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2021-06-16 21:54:16 +0200
committerHarald Anlauf <anlauf@gmx.de>2021-06-16 21:54:16 +0200
commit72e3d92178b44a3722519ec68e72e307443bda70 (patch)
tree21602429347a4bf78605b5bd747694e23406c493 /gcc/fortran/expr.c
parentbdfc1207bd20cf1ad81fca121e4f7df4995cc0d6 (diff)
downloadgcc-72e3d92178b44a3722519ec68e72e307443bda70.zip
gcc-72e3d92178b44a3722519ec68e72e307443bda70.tar.gz
gcc-72e3d92178b44a3722519ec68e72e307443bda70.tar.bz2
Fortran - ICE in gfc_check_do_variable, at fortran/parse.c:4446
Avoid NULL pointer dereferences during error recovery. gcc/fortran/ChangeLog: PR fortran/95501 PR fortran/95502 * expr.c (gfc_check_pointer_assign): Avoid NULL pointer dereference. * match.c (gfc_match_pointer_assignment): Likewise. * parse.c (gfc_check_do_variable): Avoid comparison with NULL symtree. gcc/testsuite/ChangeLog: PR fortran/95501 PR fortran/95502 * gfortran.dg/pr95502.f90: New test.
Diffstat (limited to 'gcc/fortran/expr.c')
-rw-r--r--gcc/fortran/expr.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 956003e..6e663b4 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -1683,10 +1683,21 @@ find_array_section (gfc_expr *expr, gfc_ref *ref)
return false;
}
+#if 1
cons = gfc_constructor_lookup (base, limit);
gcc_assert (cons);
gfc_constructor_append_expr (&expr->value.constructor,
gfc_copy_expr (cons->expr), NULL);
+#else
+ cons = gfc_constructor_lookup (base, limit);
+ if (cons)
+ gfc_constructor_append_expr (&expr->value.constructor,
+ gfc_copy_expr (cons->expr), NULL);
+ else
+ {
+ t = false;
+ }
+#endif
}
mpz_clear (ptr);
@@ -3476,6 +3487,7 @@ gfc_specification_expr (gfc_expr *e)
{
gfc_error ("Expression at %L must be of INTEGER type, found %s",
&e->where, gfc_basic_typename (e->ts.type));
+ gfc_clear_ts (&e->ts);
return false;
}
@@ -3815,6 +3827,9 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue,
int proc_pointer;
bool same_rank;
+ if (!lvalue->symtree)
+ return false;
+
lhs_attr = gfc_expr_attr (lvalue);
if (lvalue->ts.type == BT_UNKNOWN && !lhs_attr.proc_pointer)
{