From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 6EB133858C36; Wed, 15 Feb 2023 21:23:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6EB133858C36 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676496224; bh=rf8uf5hI/N5dUBCRu66BliQjpqSkG63AFpcjWpIZh4c=; h=From:To:Subject:Date:From; b=nc6oTu8PP+H4YOoeK7mf2bq5jdR/RpoDu57jQTu0kxd8OknZwXC8zh5Od39ODKpnc 6EJz9CEZOF7yZUEpWMVxO+37hCh9ENIXSvsx5Xdgm4/yD+japWcRRPFCWdTSCe0j30 K00jsJN/b001LMLpNpi8O7am595N0UlgvTF1vs0Q= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6066] Fortran: error recovery on invalid assumed size reference [PR104554] X-Act-Checkin: gcc X-Git-Author: Steve Kargl X-Git-Refname: refs/heads/master X-Git-Oldrev: a3e499430f1cc8a8f4aea3c26d4aba2d5eaba742 X-Git-Newrev: a418129273725fd02e881e6fb5e0877287a1356c Message-Id: <20230215212344.6EB133858C36@sourceware.org> Date: Wed, 15 Feb 2023 21:23:44 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a418129273725fd02e881e6fb5e0877287a1356c commit r13-6066-ga418129273725fd02e881e6fb5e0877287a1356c Author: Steve Kargl Date: Wed Feb 15 22:20:22 2023 +0100 Fortran: error recovery on invalid assumed size reference [PR104554] gcc/fortran/ChangeLog: PR fortran/104554 * resolve.cc (check_assumed_size_reference): Avoid NULL pointer dereference. gcc/testsuite/ChangeLog: PR fortran/104554 * gfortran.dg/pr104554.f90: New test. Diff: --- gcc/fortran/resolve.cc | 8 +++++--- gcc/testsuite/gfortran.dg/pr104554.f90 | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 96c34065691..fb0745927ac 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -1670,9 +1670,11 @@ check_assumed_size_reference (gfc_symbol *sym, gfc_expr *e) /* FIXME: The comparison "e->ref->u.ar.type == AR_FULL" is wrong. What should it be? */ - if (e->ref && (e->ref->u.ar.end[e->ref->u.ar.as->rank - 1] == NULL) - && (e->ref->u.ar.as->type == AS_ASSUMED_SIZE) - && (e->ref->u.ar.type == AR_FULL)) + if (e->ref + && e->ref->u.ar.as + && (e->ref->u.ar.end[e->ref->u.ar.as->rank - 1] == NULL) + && (e->ref->u.ar.as->type == AS_ASSUMED_SIZE) + && (e->ref->u.ar.type == AR_FULL)) { gfc_error ("The upper bound in the last dimension must " "appear in the reference to the assumed size " diff --git a/gcc/testsuite/gfortran.dg/pr104554.f90 b/gcc/testsuite/gfortran.dg/pr104554.f90 new file mode 100644 index 00000000000..099f219c85d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr104554.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! PR fortran/104554 - ICE in check_assumed_size_reference +! Contributed by G.Steinmetz + +program p + type t + integer :: a + end type + class(t) :: x(*) ! { dg-error "Assumed size array" } + x%a = 3 +end