From patchwork Tue Mar 29 20:18:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 52457 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3B7EF3886C4A for ; Tue, 29 Mar 2022 20:19:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3B7EF3886C4A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1648585162; bh=8dFfAIu1V9PoPLxSTiFEBe2VRQ3VyzQXT9QyNUzWIu8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=BZ7+2ZWOXozrzKb8jkC6fk50LaXCaAAMmCPpvhUQ4h8dCD9UdM6JozB+ofFpgY1x7 NEzYEeqw9a4vAKehk955emMB0umDAZHA0hfQG7qohI9Uw67aPicknJ4KcV+b/BC+0U IBYCt4xG6xNKCTcmgjJO1cL3pnr1mC7yY8/gv8XI= 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 8BFB9385801E; Tue, 29 Mar 2022 20:18:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8BFB9385801E X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.15.188] ([79.251.15.188]) by web-mail.gmx.net (3c-app-gmx-bap05.server.lan [172.19.172.75]) (via HTTP); Tue, 29 Mar 2022 22:18:34 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH, committed] PR fortran/104571 - ICE in resolve_elemental_actual, at fortran/resolve.cc:2383 Date: Tue, 29 Mar 2022 22:18:34 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:hpkLAZr2Kq4CqIII0pfnm55jY9042r+FsTtcW+aU7ixXhfD8ZLw+KJvz/njP1WxD2TVyL GQlja3KIAv8CzPBMKgDVfD/6c3RWzeY3EecqJelpbJORD5DECqLgGfvY9/ojzZk29JTbWjzF3PTz JXtG98Ren0bcXwqmSzD+rQnHq/ethcxD2MZH5p7UE3XKNidocWNy8EH57M6pGwdtHPNvHA6+Ltam vTqRn5yYkDJUH512dV2HZPnFnVoBCN2C+3DjND77bLMjnhYoLin1LzPHrJ6Q3D0m29lf2/WcZRXm S4= X-UI-Out-Filterresults: notjunk:1;V03:K0:BepZ+yUSmYo=:pkNAfiSxewEGz23If2HXeE BNYEW6c8MDMvb6/nm3XgUimaJiGYHb/6xNBFEmhR+v8wS97HcC7GM+gFOU1uNmLC5cYUr20r9 AYdZGaCDCdek2J4qDLBEX4gNEOJ4eE6DBWGE/Y2oLaTRj8MBL6HbBstLUnUZu3j7NBFygLGfo PPrxQrbjA7lgP/PR7hi/gPGdAJQIGaqpUus3E3kU+gSSMcZFnbmxNd0pZwUJ4wC+L5Zm7PnXF 1C9IlF4Xo4gU1FV34NX7/Y/RHK1tFIrMZ6Mjar79NylhBRF+GhQbTbjVagNDmWUgFpNjg4cda Xs4rRvnGYK0nDU8l1tRz3gS/002T0FtIaYy+3lFIOGXmMenn40MBjRoapeLwjVkpH//7UpvMq gapxAbKerpd9SGLCGCTbGF1tQB76a/nHgP47IJfCkvR7E0lgHRrukSXYKiUst5MYc9hEFrp2q YfYb+g54N0BPX/YGYmV/KupQCNeDqcBItkt5Zf2qShc0bwRM0jtJGJ7XGN/74WnMEi7SoTlSV +sks1Hd/nyeyoOnZUEQPHboD8woAap3t2artFq/7IcGr5tuMsa/SyLpmcCqQ2P663uK/f4JlD feLKx8AJEfAanAX6oldHJYUKu0E5d5SsJgUVJ5jeMHju8lSERZrKDmRDsRatxvxtuj8LtBmt2 EbjWqE9aFJSgtyE5n3XpQhl5FkfDFNTBnDrl/9U6LLJqRPdCA0SnaxDwxKgSKKFvWnYN7AON/ SQ/zJOmiytdZk5/OA7jnF43Mhcgyzw7lIHgdraNNg6lBidFPjAkXmVc/Wl61k8HgMJ/mQEwI2 SzvMO8d X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, WEIRD_PORT autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, I committed an obvious patch by Steve to avoid a NULL pointer dereference on checking for invalid specification of an elemental procedure argument: https://gcc.gnu.org/g:69db6e7f4e1d07bf8f33e93a29139cc16c1e0a2f Regtested on x86_64-pc-linux-gnu. Thanks, Harald From 69db6e7f4e1d07bf8f33e93a29139cc16c1e0a2f Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 29 Mar 2022 22:12:15 +0200 Subject: [PATCH] Fortran: avoid NULL pointer dereference checking elemental procedure args gcc/fortran/ChangeLog: PR fortran/104571 * resolve.cc (resolve_elemental_actual): Avoid NULL pointer dereference. gcc/testsuite/ChangeLog: PR fortran/104571 * gfortran.dg/pr104571.f90: New test. Co-authored-by: Steven G. Kargl --- gcc/fortran/resolve.cc | 5 +++-- gcc/testsuite/gfortran.dg/pr104571.f90 | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr104571.f90 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 290767723d8..21c8797c938 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -2397,8 +2397,9 @@ resolve_elemental_actual (gfc_expr *expr, gfc_code *c) if (rank > 0 && esym && expr == NULL) for (eformal = esym->formal, arg = arg0; arg && eformal; arg = arg->next, eformal = eformal->next) - if ((eformal->sym->attr.intent == INTENT_OUT - || eformal->sym->attr.intent == INTENT_INOUT) + if (eformal->sym + && (eformal->sym->attr.intent == INTENT_OUT + || eformal->sym->attr.intent == INTENT_INOUT) && arg->expr && arg->expr->rank == 0) { gfc_error ("Actual argument at %L for INTENT(%s) dummy %qs of " diff --git a/gcc/testsuite/gfortran.dg/pr104571.f90 b/gcc/testsuite/gfortran.dg/pr104571.f90 new file mode 100644 index 00000000000..9a6f2d0e872 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr104571.f90 @@ -0,0 +1,12 @@ +! { dg-do compile } +! { dg-options "-std=legacy" } +! PR fortran/104571 - ICE in resolve_elemental_actual +! Contributed by G.Steinmetz + +program p + real :: x(3) + call g(x) ! { dg-error "Missing alternate return" } +contains + elemental subroutine g(*) ! { dg-error "Alternate return specifier" } + end +end -- 2.34.1