aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/expr.c
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2021-12-27 23:06:18 +0100
committerHarald Anlauf <anlauf@gmx.de>2021-12-29 18:27:39 +0100
commitd8f6c48ccb85ecc0d97a84c32b7a1b8f43c64fe4 (patch)
treedea966826379a1cb42a526f2273eb0d30856e8e1 /gcc/fortran/expr.c
parentad964f7eaef9c03ce68a01cfdd7fde9d56524868 (diff)
downloadgcc-d8f6c48ccb85ecc0d97a84c32b7a1b8f43c64fe4.zip
gcc-d8f6c48ccb85ecc0d97a84c32b7a1b8f43c64fe4.tar.gz
gcc-d8f6c48ccb85ecc0d97a84c32b7a1b8f43c64fe4.tar.bz2
Fortran: avoid several NULL pointer dereferences during error recovery
gcc/fortran/ChangeLog: PR fortran/102332 * expr.c (gfc_get_variable_expr): Avoid NULL pointer dereferences during handling of errors with invalid uses of CLASS variables. * match.c (select_type_set_tmp): Likewise. * primary.c (gfc_match_varspec): Likewise. * resolve.c (resolve_variable): Likewise. (resolve_select_type): Likewise. gcc/testsuite/ChangeLog: PR fortran/102332 * gfortran.dg/pr102332.f90: New test.
Diffstat (limited to 'gcc/fortran/expr.c')
-rw-r--r--gcc/fortran/expr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index b874607..c1258e0 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -5166,7 +5166,8 @@ gfc_get_variable_expr (gfc_symtree *var)
if (var->n.sym->attr.flavor != FL_PROCEDURE
&& ((var->n.sym->as != NULL && var->n.sym->ts.type != BT_CLASS)
- || (var->n.sym->ts.type == BT_CLASS && CLASS_DATA (var->n.sym)
+ || (var->n.sym->ts.type == BT_CLASS && var->n.sym->ts.u.derived
+ && CLASS_DATA (var->n.sym)
&& CLASS_DATA (var->n.sym)->as)))
{
e->rank = var->n.sym->ts.type == BT_CLASS