From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id A57163858C54; Mon, 23 Jan 2023 21:30:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A57163858C54 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674509439; bh=RQ5TyOQD3Be4xFWYOxWkk1N6yRcAkOPwYXuV0C7f0TA=; h=From:To:Subject:Date:From; b=ILSV9vyzJFotCizyt3l69jR6Ep+/QWgsKmycj3ALPdJ5SeaGEcYX6WzKZN895ckOL 0AE6htJOaLr5cj5jlJNzItS2mH9t6Y/8fgqITM2vCzo8OXyfrmbN+KfJCaGKvM5S7B S/SkhDRiGqZgoJOzP72Jnk6FqE7Qdc06qJdrVLyQ= 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-9059] Fortran: error recovery for invalid CLASS component [PR108434] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: e1357577e6e39430869e294f94c2c547717b960f X-Git-Newrev: ea99f8d0f6674de2c2f20a5bc3221ae6325032ea Message-Id: <20230123213039.A57163858C54@sourceware.org> Date: Mon, 23 Jan 2023 21:30:39 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ea99f8d0f6674de2c2f20a5bc3221ae6325032ea commit r12-9059-gea99f8d0f6674de2c2f20a5bc3221ae6325032ea Author: Harald Anlauf Date: Wed Jan 18 22:13:29 2023 +0100 Fortran: error recovery for invalid CLASS component [PR108434] gcc/fortran/ChangeLog: PR fortran/108434 * expr.cc (class_allocatable): Prevent NULL pointer dereference or invalid read. (class_pointer): Likewise. gcc/testsuite/ChangeLog: PR fortran/108434 * gfortran.dg/pr108434.f90: New test. (cherry picked from commit 117848f425a3c0eda85517b4bdaf2ebe3bc705c2) Diff: --- gcc/fortran/expr.cc | 4 ++-- gcc/testsuite/gfortran.dg/pr108434.f90 | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/expr.cc b/gcc/fortran/expr.cc index 69d0b57c688..ab54d43bce2 100644 --- a/gcc/fortran/expr.cc +++ b/gcc/fortran/expr.cc @@ -4996,14 +4996,14 @@ get_union_initializer (gfc_symbol *union_type, gfc_component **map_p) static bool class_allocatable (gfc_component *comp) { - return comp->ts.type == BT_CLASS && CLASS_DATA (comp) + return comp->ts.type == BT_CLASS && comp->attr.class_ok && CLASS_DATA (comp) && CLASS_DATA (comp)->attr.allocatable; } static bool class_pointer (gfc_component *comp) { - return comp->ts.type == BT_CLASS && CLASS_DATA (comp) + return comp->ts.type == BT_CLASS && comp->attr.class_ok && CLASS_DATA (comp) && CLASS_DATA (comp)->attr.pointer; } diff --git a/gcc/testsuite/gfortran.dg/pr108434.f90 b/gcc/testsuite/gfortran.dg/pr108434.f90 new file mode 100644 index 00000000000..e1768a57574 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr108434.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! PR fortran/108434 - ICE in class_allocatable +! Contributed by G.Steinmetz + +program p + type t + class(c), pointer :: a(2) ! { dg-error "must have a deferred shape" } + end type t + class(t), allocatable :: x + class(t), pointer :: y +end