From e505f7493bed1395d121d2f53137ec11706fa42e Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Wed, 9 Nov 2022 21:05:28 +0100 Subject: [PATCH] Fortran: avoid NULL pointer dereference on bad EQUIVALENCEs [PR107559] gcc/fortran/ChangeLog: PR fortran/107559 * resolve.cc (resolve_equivalence): Avoid NULL pointer dereference while emitting diagnostics for bad EQUIVALENCEs. gcc/testsuite/ChangeLog: PR fortran/107559 * gfortran.dg/pr107559.f90: New test. --- gcc/fortran/resolve.cc | 2 ++ gcc/testsuite/gfortran.dg/pr107559.f90 | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr107559.f90 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 9202e2f10ad..5ff1cd070ac 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -17218,6 +17218,7 @@ resolve_equivalence (gfc_equiv *eq) "statement at %L with different type objects"; if ((object ==2 && last_eq_type == SEQ_MIXED + && last_where && !gfc_notify_std (GFC_STD_GNU, msg, first_sym->name, last_where)) || (eq_type == SEQ_MIXED && !gfc_notify_std (GFC_STD_GNU, msg, sym->name, &e->where))) @@ -17227,6 +17228,7 @@ resolve_equivalence (gfc_equiv *eq) "statement at %L with objects of different type"; if ((object ==2 && last_eq_type == SEQ_NONDEFAULT + && last_where && !gfc_notify_std (GFC_STD_GNU, msg, first_sym->name, last_where)) || (eq_type == SEQ_NONDEFAULT && !gfc_notify_std (GFC_STD_GNU, msg, sym->name, &e->where))) diff --git a/gcc/testsuite/gfortran.dg/pr107559.f90 b/gcc/testsuite/gfortran.dg/pr107559.f90 new file mode 100644 index 00000000000..714e236df50 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr107559.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! { dg-options "-std=f95" } +! PR fortran/107559 - ICE in resolve_equivalence +! Contributed by G.Steinmetz + +module m + implicit none + integer, protected :: a ! { dg-error "Fortran 2003: PROTECTED attribute" } + integer :: b + equivalence (a, b) ! { dg-error "has no IMPLICIT type" } +end -- 2.35.3