From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by sourceware.org (Postfix) with ESMTPS id 387993858433; Mon, 13 Feb 2023 21:13:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 387993858433 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=1676322798; bh=mFsZsdTMUPxEyJi4LP9DE6dEa+R1K9vr8XgGoy7XtPs=; h=X-UI-Sender-Class:From:To:Subject:Date; b=EwKZVDViseibcBLcrPpUGNaC8LL1XSU2fXwjyF77F8aJq4QX9dtrte/PHCd/gWE1o Esp3Q5jlPt2Oe5mp6zjlRs8ycY6vF8UWs5BHH1DIn9uuxaTE0sXoOQJ4LzsdaXSggX JufN1TXA94QA+6OwXF3Fd+M+5tetAS8ciRkr3MSG9AQ/EZzaJHBtdxqxQogQfeKQPg 9QKMyKtVnxlubCK94yBZlonOXpMB1xXDqNKS3XkE+EbLJ87WCB9H9YIiQJdziGvy3/ HUa6/C7+bcK125JewQdb8qKCmsIodmTcfZIaOZp/EuCLWeBHiXUEV+p0lJ5eTuKvO/ V+1Xdxmz/xdUg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.80.251] ([93.207.80.251]) by web-mail.gmx.net (3c-app-gmx-bap61.server.lan [172.19.172.131]) (via HTTP); Mon, 13 Feb 2023 22:13:18 +0100 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH, committed] Fortran: error recovery after invalid use of CLASS variable [PR103475] Content-Type: multipart/mixed; boundary=refeik-77351086-6586-42b3-9dcb-a12d4803148f Date: Mon, 13 Feb 2023 22:13:18 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:1LX1I0TPjnR31JhsMzoSEgq1jztaIzOVWeoh73MWWBDI35w+4zeygnN4TKdqKNTARKY2E q23XiZ381do0PIuJNN55iLZoi1Sokp7m2VH85jJWqMxa3MR2CiUEyHxxgbJza8I5GaQOB3EvLXJk lpIw4V9GtWU/08LaMpnDEgCNtX0nGTJBCZT4sdJeOPAvJOIvJkZzpuoXPui5oPRWAJ1vR77cddOi bbJwDPXrCDBBMDkNxyS1RV96OtCxYBSjedZYg6GfCxN3ehhLsiCHJJzdzFJHy+a8/6FqqrZzN1QO Mo= UI-OutboundReport: notjunk:1;M01:P0:1a4Ui07u018=;lvDegX3oYG3RvEt0p3O9VUN6fSX LHrp1siSEu2+BHcf6hl+qRBCiSgyrdNoEUw0FedLQn8+Qk1oS7VtwMuIye8rRnvmqFOZR6QHX bR64iPkcZ2rc9YjmcqCkXjiW8Lrvy3jo0OTEzYdoeroHjFlYATX9X1ksgRpis5EwjwZGHy8TW 8tHS/LTRpLNA/L/5MzW+f05BItS65sRVuikdbhuhf6m9//OzPHqqw2bO2/ZXOIwTlZEaWABYZ E9JDSjVWjKFlVB4aKjvhDQUB15PbKRY6KgcmgVb/wrjEX3zkSu1GLIBRGXowCw8zIGonPvsnB 4qGB/c8bbIsMmF16oZ+sQin4IX0/2WfQVLA8/pzfYE5zUoDp4cJV/vFyT5WnO+oZbqmIiN7We 9pO2SPv/204QiCrKRD+ZbukRm1x5XH1jLxN4q6fyFBENmgoQuDzwTAyGGOHGLplVDtOv96zln ZIn4dK9vznpZi6YlRD3D5icBFs3ug2Sy3+6ETOJfbA4Wm5RUlJA5zv33Ri5os3HrBayQRbqJL oMYLDoFiHqNeUJBekgWkpS0gr67hAKTzn3zVB7Q3KMA/5xYu2HmxtAyJXrVy1mTDFAA+od7kS TpfF43518jVUlVUyBts+WR/88DmASKtcuD5WmqNFu+7tu8JE6qHPPAQV2ibLGgebHLksEimLI UmtNFjH2x2Cjt5+tWLevfrViiwFSgSagKe0cfpPi1LSJDGtimpcKrVAH6qkr3rGEt0cSDG0JW D/xKtEtlg9HEFnp7s23dh8L+9lxSgrtP/ZoUt8WYraRP1I4YXWfRET63jL3FRyCFJg054xgFt RvUZd03bttJ/aOdXtJOZ9Cd+sD3DqU6Mr1ayRM5GmYrlE= X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,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: --refeik-77351086-6586-42b3-9dcb-a12d4803148f Content-Type: text/plain; charset=UTF-8 Dear all, the attached simple and obvious patch fixes a NULL pointer dereference on an invalid use of a CLASS variable. Committed to mainline after regtesting on x86_64-pc-linux-gnu as https://gcc.gnu.org/g:2ce7e2a83e18a27fe9c659f8667fc24f0df4ea9a Thanks, Harald --refeik-77351086-6586-42b3-9dcb-a12d4803148f Content-Type: text/x-patch Content-Disposition: attachment; filename=pr103475.diff Content-Transfer-Encoding: quoted-printable =46rom 2ce7e2a83e18a27fe9c659f8667fc24f0df4ea9a Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Mon, 13 Feb 2023 22:02:44 +0100 Subject: [PATCH] Fortran: error recovery after invalid use of CLASS variab= le [PR103475] gcc/fortran/ChangeLog: PR fortran/103475 * primary.cc (gfc_expr_attr): Avoid NULL pointer dereference for invalid use of CLASS variable. gcc/testsuite/ChangeLog: PR fortran/103475 * gfortran.dg/pr103475.f90: New test. =2D-- gcc/fortran/primary.cc | 2 +- gcc/testsuite/gfortran.dg/pr103475.f90 | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr103475.f90 diff --git a/gcc/fortran/primary.cc b/gcc/fortran/primary.cc index 28ce5fea865..1bea17d44fe 100644 =2D-- a/gcc/fortran/primary.cc +++ b/gcc/fortran/primary.cc @@ -2770,7 +2770,7 @@ gfc_expr_attr (gfc_expr *e) { gfc_symbol *sym =3D e->value.function.esym->result; attr =3D sym->attr; - if (sym->ts.type =3D=3D BT_CLASS) + if (sym->ts.type =3D=3D BT_CLASS && sym->attr.class_ok) { attr.dimension =3D CLASS_DATA (sym)->attr.dimension; attr.pointer =3D CLASS_DATA (sym)->attr.class_pointer; diff --git a/gcc/testsuite/gfortran.dg/pr103475.f90 b/gcc/testsuite/gfortr= an.dg/pr103475.f90 new file mode 100644 index 00000000000..6cce5e8ebf7 =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr103475.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! { dg-options "-O2 -Wall" } +! PR fortran/103475 - ICE in gfc_expr_attr +! Contributed by G.Steinmetz + +program p + type t + end type + class(t) :: x ! { dg-error "must be dummy, allocatable or pointer" } + y =3D x() ! { dg-error "Cannot convert invalid class" } +end =2D- 2.35.3 --refeik-77351086-6586-42b3-9dcb-a12d4803148f--