From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 89B3C3858D33; Thu, 16 Feb 2023 17:30:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89B3C3858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676568640; bh=4qPvQFBftj59ovMxPZNGg51Mdhu5xobb4tAvNm40OM4=; h=From:To:Subject:Date:From; b=HzSm+h6wPReX13Kmdc2XKdbI3nOmPTf7Yyd56km4om6caZzRFyJTCiOga9u5vqSbX JgATOIoovHWYBBzr/PCeiDtwYBcO9ekPOjkx6Tqb24VXkzuv5f45gsOoo4sIjGIVXd ueB5P+2OwxOsEVBHx8Qlx55y2xfose0NRu4rNZRw= 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 r12-9179] Fortran: error recovery on invalid assumed size reference [PR104554] X-Act-Checkin: gcc X-Git-Author: Steve Kargl X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 86caa970dddfac124a2bbbfe3e695348d00eb926 X-Git-Newrev: e2c6bc6bb5628bb51b56d1da3f9907ae45a3a01b Message-Id: <20230216173040.89B3C3858D33@sourceware.org> Date: Thu, 16 Feb 2023 17:30:40 +0000 (GMT) List-Id: https://gcc.gnu.org/g:e2c6bc6bb5628bb51b56d1da3f9907ae45a3a01b commit r12-9179-ge2c6bc6bb5628bb51b56d1da3f9907ae45a3a01b 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. (cherry picked from commit a418129273725fd02e881e6fb5e0877287a1356c) 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 565b212c4c8..532ca05b69c 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