From patchwork Tue Dec 14 21:02:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1567874 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=OcFOO0h+; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JD9qy2F6Pz9s3q for ; Wed, 15 Dec 2021 08:05:00 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 87FBF3858012 for ; Tue, 14 Dec 2021 21:04:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 87FBF3858012 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1639515898; bh=Ga+yvwSIytnIXLwJCcABDQW7r0GS962qL2nQXxKihI4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=OcFOO0h+G/rIqMkgfDxW9vvtsOV56/ts4xjfIEEjzAz81598u3v/mQaqe8sN4uwPM bAa0YY2dOOvJKCnUbToOS+X6vmUhqV2/bhrqhraKYmT823NdNQkKLGVvBFe+XFziVW yqI0vqRbAb0FGEd75ZeEE4EodVWBiUNhOsIHiK6E= 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.15.15]) by sourceware.org (Postfix) with ESMTPS id CA8C3385842A; Tue, 14 Dec 2021 21:02:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CA8C3385842A X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.12.246] ([79.251.12.246]) by web-mail.gmx.net (3c-app-gmx-bs57.server.lan [172.19.170.141]) (via HTTP); Tue, 14 Dec 2021 22:02:44 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH, committed] PR fortran/103717 - ICE in doloop_code, at fortran/frontend-passes.c:2656 Date: Tue, 14 Dec 2021 22:02:44 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:8mvVJAi8rAIOMqPejVcAOrnUn25SLGbMA7g1MFDYYYNZ6wRDRHHMSRlDXUirA10PhiPcX mCwbCpafH7cyUf/qEvbFgqmf2WTQhsWV/9y/IMqyq9ZzqixYG7+h8giFrJ9EimFFOqIZ3nLs6tSg OgfsF8lo5NJWEKGUy2Th+tkDnMVotSlGSTusyIamuzn1GmieWIMPwMjlhciIOWQxvE/UBTP79eoG WQ3lXWFCMNOka0rMHawKhU+/vV/dBzMKnMOkv4xF4YWHUlbUs16XM6jvC9JTmaiVcJGhJ28sQStY x8= X-UI-Out-Filterresults: notjunk:1;V03:K0:wLzr6icd+fU=:PDYrk8mRXUQzLoVbdzli1G gOsz3I8BG3MscdBNmPBCuj8gClSbOVhop4Z9TTy3if7HPjnygOjuiPc1fQil6QcIz5m6nhSYL rFJkkeAwjl1tWg1engDbN1lmeoPF7b7tbLBIBfqhoKze8cOgK3TfK8Ixod2X9MTnn2b3tTji/ rZYlb5trxkfsL/VPFmzDTgHLlZnqa9KIJ2r0WbqGBecnzpwEWJzlastojVErCHCPhkD0lF8Io qnpNC9bfoAhOHzP+gn5J1iHxiAx09Avq3hreHjEk4HOdUrgpdIjtEgxoJK8vUsLv2ZxTQ8ZpP T8ZqKV+GIvYT8DsAl4mBG3QvDNvWjILXI4lsLKMaOth4OZNcRhKFMoiN4/LTYpq6AvHJ2H43v vS0Tc4jcfbI9yut4P6Yo0it12kk/Mq0J3oDtYV9zi03Vw6vhfXMcR7mNKG0mdP9cF+h88UT+L C7nMFwwPs/CDPwiWozNZSr5CUfO/b0SXSNwS8Wb9Cf6OGDLrQ+R88ENa4Xf+FM4dk/3JolAFT voQvuV3gEu5hykIfhi9ttKDPuSrBCd1d5T2vK5Hqo3vK61lNndKW1n+43UQN4lO0AW+mbXW70 rW4ZX9RGjaNRsntqUzcVFMwUydhopPGbrAKxGrOxD4b200LI7ed5590ygipMnnbF7ISq50X3B lFm+cKhCZWLAcp4xjBYaXg6HaJ9Es1kmejJPbR3LD9+eqW3EEfr1BpB0WiJKkaEW0wYaV0BKx 72kBrKAwSBE5TQHc5kRkpfQaDVjvK7PlnZr1LCxkez63Yh/Oa/lFPopyYxZWeHxbgg3qoRGAs eDg0p3H X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, the attached patch fixes an obvious NULL pointer dereference. Committed as obvious after regtesting on x86_64-pc-linux-gnu. Will "backport" to 11-branch after waiting a few days unless someone protests. Thanks, Harald From ca39102e10643a6b3f07d06934cc0907ba83d9ee Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 14 Dec 2021 21:57:04 +0100 Subject: [PATCH] Fortran: prevent NULL pointer dereference in check of passed do-loop variable gcc/fortran/ChangeLog: PR fortran/103717 * frontend-passes.c (doloop_code): Prevent NULL pointer dereference when checking for passing a do-loop variable to a contained procedure with an interface mismatch. gcc/testsuite/ChangeLog: PR fortran/103717 * gfortran.dg/do_check_19.f90: New test. --- gcc/fortran/frontend-passes.c | 2 +- gcc/testsuite/gfortran.dg/do_check_19.f90 | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/do_check_19.f90 diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index c106ee0957a..6ffe072b185 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -2653,7 +2653,7 @@ doloop_code (gfc_code **c, int *walk_subtrees ATTRIBUTE_UNUSED, do_sym = cl->ext.iterator->var->symtree->n.sym; - if (a->expr && a->expr->symtree + if (a->expr && a->expr->symtree && f->sym && a->expr->symtree->n.sym == do_sym) { if (f->sym->attr.intent == INTENT_OUT) diff --git a/gcc/testsuite/gfortran.dg/do_check_19.f90 b/gcc/testsuite/gfortran.dg/do_check_19.f90 new file mode 100644 index 00000000000..1373a7374ce --- /dev/null +++ b/gcc/testsuite/gfortran.dg/do_check_19.f90 @@ -0,0 +1,21 @@ +! { dg-do compile } +! { dg-prune-output "Obsolescent feature: Alternate-return argument" } +! PR fortran/103717 - ICE in doloop_code +! Contributed by G.Steinmetz + +program p + integer :: i + do i = 1, 2 + call s(i) ! { dg-error "Missing alternate return specifier" } + end do +contains + subroutine s(*) + end +end + +recursive subroutine s(*) + integer :: i + do i = 1, 2 + call s(i) ! { dg-error "Missing alternate return specifier" } + end do +end -- 2.26.2