From patchwork Mon Feb 13 21:13:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1741951 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=vftEDr+r; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PFxtL49rsz23y6 for ; Tue, 14 Feb 2023 08:14:34 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7012D3854153 for ; Mon, 13 Feb 2023 21:14:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7012D3854153 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676322872; bh=Nt4nSJjJ4pba56Rb5Diy1EdIjlz+5oCwiVqAE+J5bJI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=vftEDr+rpjsuQ9D2VrjZxYcG/o8qM1Zbs0UnzKAj2x6i7j7F2WY/4NxloDBhN6Bky Z3BMllYVSpWUqNUqIs0+tnCruyYxQoCKh4v6v2JxS7iR1WvwQ9hBC/yHSlH/8ogihM k5ZEoHNXE+7mPTtdLLgBGPICoPAz3Amzxa30+IFw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 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: To: fortran , gcc-patches Subject: [PATCH, committed] Fortran: error recovery after invalid use of CLASS variable [PR103475] 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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 From 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 variable [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. --- 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 --- a/gcc/fortran/primary.cc +++ b/gcc/fortran/primary.cc @@ -2770,7 +2770,7 @@ gfc_expr_attr (gfc_expr *e) { gfc_symbol *sym = e->value.function.esym->result; attr = sym->attr; - if (sym->ts.type == BT_CLASS) + if (sym->ts.type == BT_CLASS && sym->attr.class_ok) { attr.dimension = CLASS_DATA (sym)->attr.dimension; attr.pointer = CLASS_DATA (sym)->attr.class_pointer; diff --git a/gcc/testsuite/gfortran.dg/pr103475.f90 b/gcc/testsuite/gfortran.dg/pr103475.f90 new file mode 100644 index 00000000000..6cce5e8ebf7 --- /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 = x() ! { dg-error "Cannot convert invalid class" } +end -- 2.35.3