From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by sourceware.org (Postfix) with ESMTPS id 378D83858D20; Sat, 3 Dec 2022 18:27:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 378D83858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1670092066; bh=ySVjb5SEUCkzbG72XkcIrm5G5mEuuEggj3P72i902CY=; h=X-UI-Sender-Class:From:To:Subject:Date; b=mVxZkBNX9c/FiTj+qMS2zi9mBiU//5avliCiQdSBExe0brPX/sRsR7kLYORuNk7El fXRWQqtJA97NNnZ1XQPRwgOymSxrg1xiJveUkFqiUWot1LqILV9BNS9+f1tRc5gJz4 +Y7yMC/05Q9iBHXkWyKPMtcuF+KigbtCW6uppzCGn7V0f36GkemfiSZ+OcAi3hXfO6 IhNm7eZH4QRC2faYM+3PcTziPYxMno4tcpQ/xSyvgBrPMtvYrlJyJpbUXEb2Ta4HiR V9Z/hf2UDhZ4h/KBH3xkzOkz2WJ+WHPe/deuzJt8l3/A/TyYZZ4ZPeu3Va4I8IERo1 sBE7Hn/viewUg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.85.95] ([93.207.85.95]) by web-mail.gmx.net (3c-app-gmx-bs55.server.lan [172.19.170.139]) (via HTTP); Sat, 3 Dec 2022 19:27:46 +0100 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] Fortran: error recovery handling invalid CLASS variable [PR107899] Content-Type: multipart/mixed; boundary=nika-7d13a99d-f7ea-4807-b0e4-01114aa9edd2 Date: Sat, 3 Dec 2022 19:27:46 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:GokTIJhLu0YYj1ht2WMaDuXkPuIIMTEpw/iuA5Zsc1yxNMUSWYnZmBq2mSRTmkwxOKQou cV9ASVRO6VaTgcDi+57/3NqvX+/t4Gzh8cS94exH6EvO8IfZpmmOkzwiA6LJvU7iCxMfo6PPnrsI gOGo7eTeINJ/XvkuJlmXEzn/uDEN313l2x0n/rmir0GQbfXLCwQ946QCpB7sqZjXMktzJOYJ7z8R N/KCdkkIRODV//XAWm5tTydr7ZGuyS/c6/HNaeB2lZySUKOTVvnKZzLkUtmUJ6Anblt1sfXe++rL Cc= UI-OutboundReport: notjunk:1;M01:P0:mPwOlv4BJZc=;qD2MQF19afi4Z0NjvdjAMw/ijgk N6hJzImjl8ZrUbWEltiuNy3Du4iSTGyYW+tTHU4nGlYp17UNbDmRMperJkEf0eNOjLRl4mg0X 4Wp9vbbQawxKPxayg0FepomORaivsjWo4PsSu2fzHeP53kLT6vvf1+3qdHf4OHQhAc2Us6APr BnuGHOgyKlDCqxre7jyFfhaQOPYxBIq/FnIiUPHDWLIGONGe8pNX8uy9U2xasSyiU7pYbSTwh rsWzQRWpI7GufAhcYmlRk/U89f39t9mnVeN4rmcvuE6svHBHrntOXXnmQ42huMrffqtU5xc9M xQYoNXyg1WveQBEp7rAGcm/XZyKEAMmCH7zM1m3ts4qRNcIt0AgHNWHmQv5gKciQiV358RBwW gug27oR+mhygNAfMRbm84lGTCqeAEGJILF10A6ZwBLoCtM9W77wSc2vdU0nWNmF1OLCxjTa0L FrrxrdjcdXhWKmf0UpV5t5C0soBjIO9iS55f3h30k4E0Wyfo100r09JX7SVEwhh81brDTr8w/ MZgM3uV+11hi/XgAIKq9Zq+1h0so1fOOWUxHJbRDg9nlJwrrH3okULa+U2qWCAILVCyoranrn ZwG47UmCxOe+p9nAuoXwTcL33wC2ZwR0Al5UayyFSigAWNfBOIa+i5e71o9fYi1GucmB0Iswr l25l/fqkdD11MUwWPiqdJJvxVjwvJkHuGZ6p6ARVB07+DpI+qUry605RJO5grmAyZO2gYg1ip fLFS4SP/YAfhVIxaJePfgt8+jXya73uyOnJrWlEYn9K1v+4UJ/a7EryFgJcyY6YF14uaVCL8F QTNVrHtHHIR5wBkjp0KW1CzQ== X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --nika-7d13a99d-f7ea-4807-b0e4-01114aa9edd2 Content-Type: text/plain; charset=UTF-8 Dear all, the attached obvious patch fixes a NULL pointer dereference that occurs with an invalid CLASS argument to DEALLOCATE. Regtested on x86_64-pc-linux-gnu. Will commit soon unless there are comments. Thanks, Harald --nika-7d13a99d-f7ea-4807-b0e4-01114aa9edd2 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr107899.diff Content-Transfer-Encoding: quoted-printable =46rom dfe7f1a06d78f6319ad81f5774dc43fe52e37f45 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Sat, 3 Dec 2022 19:21:07 +0100 Subject: [PATCH] Fortran: error recovery handling invalid CLASS variable [PR107899] gcc/fortran/ChangeLog: PR fortran/107899 * resolve.cc (resolve_deallocate_expr): Avoid NULL pointer dereference on invalid CLASS variable. gcc/testsuite/ChangeLog: PR fortran/107899 * gfortran.dg/pr107899.f90: New test. =2D-- gcc/fortran/resolve.cc | 2 +- gcc/testsuite/gfortran.dg/pr107899.f90 | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr107899.f90 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 3396c6ce4a7..75dc4b59105 100644 =2D-- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -7570,7 +7570,7 @@ resolve_deallocate_expr (gfc_expr *e) sym =3D e->symtree->n.sym; unlimited =3D UNLIMITED_POLY(sym); - if (sym->ts.type =3D=3D BT_CLASS) + if (sym->ts.type =3D=3D BT_CLASS && sym->attr.class_ok && CLASS_DATA (s= ym)) { allocatable =3D CLASS_DATA (sym)->attr.allocatable; pointer =3D CLASS_DATA (sym)->attr.class_pointer; diff --git a/gcc/testsuite/gfortran.dg/pr107899.f90 b/gcc/testsuite/gfortr= an.dg/pr107899.f90 new file mode 100644 index 00000000000..e47b57b7b91 =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr107899.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! { dg-options "-fcoarray=3Dsingle" } +! PR fortran/107899 - ICE in resolve_deallocate_expr +! Contributed by G.Steinmetz + +program p + type t + end type + class(t), target :: x[:] ! { dg-error "deferred shape" } + if (allocated (x)) then ! { dg-error "must be ALLOCATABLE" } + deallocate (x) ! { dg-error "must be ALLOCATABLE or a POINTER= " } + end if +end =2D- 2.35.3 --nika-7d13a99d-f7ea-4807-b0e4-01114aa9edd2--