diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2020-07-10 21:00:13 +0200 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2020-07-10 21:00:13 +0200 |
| commit | 8a0b69f0b089c05d233b8e1a941825b1ceac93bd (patch) | |
| tree | 3e9ab99378053212e91fbd4877d2809ee3cd2b9a /gcc | |
| parent | 2b6d99468d4d988fd5f5ea3e9be41a3dc95a1291 (diff) | |
| download | gcc-8a0b69f0b089c05d233b8e1a941825b1ceac93bd.zip gcc-8a0b69f0b089c05d233b8e1a941825b1ceac93bd.tar.gz gcc-8a0b69f0b089c05d233b8e1a941825b1ceac93bd.tar.bz2 | |
PR fortran/96086 - ICE in gfc_match_select_rank, at fortran/match.c:6645
Handle NULL pointer dereference on SELECT RANK with an invalid
assumed-rank array declaration.
gcc/fortran/
PR fortran/96086
* match.c (gfc_match_select_rank): Catch NULL pointer
dereference.
* resolve.c (resolve_assoc_var): Catch NULL pointer dereference
that may occur after an illegal declaration.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/match.c | 5 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr96086.f90 | 8 |
3 files changed, 14 insertions, 3 deletions
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index 7d3711c..cb09c5f 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -6647,7 +6647,8 @@ gfc_match_select_rank (void) if (expr2->symtree) { sym2 = expr2->symtree->n.sym; - as = sym2->ts.type == BT_CLASS ? CLASS_DATA (sym2)->as : sym2->as; + as = (sym2->ts.type == BT_CLASS + && CLASS_DATA (sym2)) ? CLASS_DATA (sym2)->as : sym2->as; } if (expr2->expr_type != EXPR_VARIABLE @@ -6659,7 +6660,7 @@ gfc_match_select_rank (void) goto cleanup; } - if (expr2->ts.type == BT_CLASS) + if (expr2->ts.type == BT_CLASS && CLASS_DATA (sym2)) { copy_ts_from_selector_to_associate (expr1, expr2); diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 6bc1c46..d7e6acd 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -9012,7 +9012,9 @@ resolve_assoc_var (gfc_symbol* sym, bool resolve_target) if (as->corank != 0) sym->attr.codimension = 1; } - else if (sym->ts.type == BT_CLASS && (!CLASS_DATA (sym)->as || sym->assoc->rankguessed)) + else if (sym->ts.type == BT_CLASS + && CLASS_DATA (sym) + && (!CLASS_DATA (sym)->as || sym->assoc->rankguessed)) { if (!CLASS_DATA (sym)->as) CLASS_DATA (sym)->as = gfc_get_array_spec (); diff --git a/gcc/testsuite/gfortran.dg/pr96086.f90 b/gcc/testsuite/gfortran.dg/pr96086.f90 new file mode 100644 index 0000000..b80967a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr96086.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/96086 - ICE in gfc_match_select_rank, at fortran/match.c:6645 + +subroutine s + class(*) :: x(..) ! { dg-error "Assumed-rank array" } + select rank (y => x) ! { dg-error "CLASS variable" } + end select +end |