From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 8E0C73858D28; Wed, 15 Dec 2021 19:36:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8E0C73858D28 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-9386] Fortran: prevent NULL pointer dereference in check of passed do-loop variable X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 689f8fed9b2a250e6cbeeec4fa882b8afd34eec8 X-Git-Newrev: 1a5c50c3ad2a2f66f1232d25b0f0c15ee1bf449f Message-Id: <20211215193618.8E0C73858D28@sourceware.org> Date: Wed, 15 Dec 2021 19:36:18 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2021 19:36:18 -0000 https://gcc.gnu.org/g:1a5c50c3ad2a2f66f1232d25b0f0c15ee1bf449f commit r11-9386-g1a5c50c3ad2a2f66f1232d25b0f0c15ee1bf449f Author: Harald Anlauf Date: Tue Dec 14 21:57:04 2021 +0100 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. (cherry picked from commit ca39102e10643a6b3f07d06934cc0907ba83d9ee) Diff: --- gcc/fortran/frontend-passes.c | 2 +- gcc/testsuite/gfortran.dg/do_check_19.f90 | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index 10fa0ff3707..b58cc249f23 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