aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2020-06-28 16:24:15 +0200
committerGiuliano Belinassi <giuliano.belinassi@usp.br>2020-08-17 13:15:13 -0300
commita4f7d63e1440ca169e57d95f635ab6465565fbdf (patch)
treef89a54cdac49e08a90cf4ac5adb801697d88fc51
parentafe27a25586e24f7ac0204090a835e2109b54cde (diff)
downloadgcc-a4f7d63e1440ca169e57d95f635ab6465565fbdf.zip
gcc-a4f7d63e1440ca169e57d95f635ab6465565fbdf.tar.gz
gcc-a4f7d63e1440ca169e57d95f635ab6465565fbdf.tar.bz2
PR fortran/95340 - ICE in gfc_match_select_rank, at fortran/match.c:6690
Do not dereference NULL pointer when querying array shape of possibly improperly delared variable. gcc/fortran/ PR fortran/95340 * match.c (gfc_match_select_rank): Do not dereference NULL pointer.
-rw-r--r--gcc/fortran/match.c3
-rw-r--r--gcc/testsuite/gfortran.dg/pr95340.f9010
2 files changed, 12 insertions, 1 deletions
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index b011634..db5174f 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -6695,7 +6695,8 @@ gfc_match_select_rank (void)
if (expr1->symtree)
{
sym = expr1->symtree->n.sym;
- as = sym->ts.type == BT_CLASS ? CLASS_DATA (sym)->as : sym->as;
+ as = (sym->ts.type == BT_CLASS
+ && CLASS_DATA (sym)) ? CLASS_DATA (sym)->as : sym->as;
}
if (expr1->expr_type != EXPR_VARIABLE
diff --git a/gcc/testsuite/gfortran.dg/pr95340.f90 b/gcc/testsuite/gfortran.dg/pr95340.f90
new file mode 100644
index 0000000..edcdc93
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr95340.f90
@@ -0,0 +1,10 @@
+! { dg-do compile }
+! PR fortran/95340 - ICE in gfc_match_select_rank, at fortran/match.c:6690
+
+program p
+ type t
+ end type t
+ class(t) :: z ! { dg-error "must be dummy, allocatable or pointer" }
+ select rank (z) ! { dg-error "must be an assumed rank variable" }
+ end select ! { dg-error "Expecting END PROGRAM" }
+end