From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by sourceware.org (Postfix) with ESMTPS id 74E353858D3C; Wed, 19 Oct 2022 20:49:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 74E353858D3C 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.net; s=badeba3b8450; t=1666212584; bh=0meUM46TuC+Y8PNZIWo5xH5QNWr1jq0h/EI0kB6vDLw=; h=X-UI-Sender-Class:From:To:Subject:Date; b=L9tqQU4YN/3biEmlWUpjkCdxqsbxVxlzPmDJcR78/LqOdDoJLrHQ9pfos/KiYhx/l ktT2rAD0C2zNnEBy2YXS/ZNnj5aRq0jux0NIBK1aXFFo2YJ6O4RYzZwrjxdYOzhgcW Xn93I31llBVt+U+QKBPwE9ueTiO/NOHpvlQ5fCqU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.84.161] ([93.207.84.161]) by web-mail.gmx.net (3c-app-gmx-bap39.server.lan [172.19.172.109]) (via HTTP); Wed, 19 Oct 2022 22:49:44 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] Fortran: error recovery with references of bad array constructors [PR105633] Content-Type: multipart/mixed; boundary=abmob-b35add18-3526-48ed-a289-966c37c11a10 Date: Wed, 19 Oct 2022 22:49:44 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:bMchlx/tLvHjXze8NfCBb1kBSyNNpQn8sUXkl1F5w8ALVr1HElSrwAZQyKJCP3j15jRIM Ei98wI4ThhMEQyCBOCxfUHCRj1j9glQ+aUGQUJAzXpg0ms8UvjS6R7w8Me/x9OLIPVxKxyzFeUnW 5HSKxKp/RYJ8InTOqflEbSdSS2KFuRR2uEMT0KI95RglZ6CeIJuerhK3ObKSHQFR2fOcxAo3fPi1 jr7HBFIzvfNmccqOGpiD8wPxTGyNmxd77C64i2Uq+Qh1E+pFe5ZbhBJK4qI3QZEFkm2AkUK5ajxo 5Y= X-UI-Out-Filterresults: notjunk:1;V03:K0:l+QGRLS/t8U=:qzRo2QLq6bn9lUq0RHcLKn 2ToCU7ZuOUuOfgNr3wtTzQ2VPPMXDYhdm3BVhAwDayWpnBPabkrMkIdqxbzSKIB+WTJU/qd9B w/w4cHYjtrM9HlzDIcTGmgk62EOVLn4jr5ZOcH9eJGb9IRTHsMIKntfVVxVU1gESJVnw1wQTD SJYI26D37uV4NY0AaC1Qtx7YM88SYEjMHsfjNyv9yR6/dF6M4ysS/eSVLAJtCYdHxeto9aYyW WI2jVV39+VVDM6Jy+drNJnUt97HQMiG5d2hjiBG0DVROs/b9wwryKDJjfvmJI5rlI224uUQj7 /NdlQKAhOcOVN+v0RxIs+s0rYZup4TGAYadHq8ATVkG+wRJmvCmnaPyKpl6ltepSXIgrvdf0D bHrXxtfnYNB9i9yGbeWGBgX+MQzCFrM1UaRseEayxjBNMQVQAjrTN47405Seo1EDr0py7FjIB W9o5BIENoMdIEEJ8u+2ny0uMxVGNYVZwa18+xP4LPUC2C5uLZlevpiiu/laBnl2SMy2sqZBRq kopKfqsX8wmuftHTUvrWMWGkFvU0bBvKd5eEGC/+jcbR2nCDN0XzyjDFq/HypC9UtMeoIOHeP kBLm8fdMIevYONkXPmzdGKeH6qdjtWD2DThqh2podGStBJAWrdV1rRmVs7EHaej58YuTaFxKF 2sgTVxAjsTZo3cRodXc3n2ixSHkxwh34FcppOLUL9dc2EYRahbVdIjkOJfbO/KLC3iaLyzyYV XcqahT7Mz6GBvxWOzckTYm8szxn/QESnhrA/N+kl6CWO05kt5oDWDEIviv/fGx2fW6AFEpT2z uKxsRWJUyvxU1STwyzq6jd+PXHm4dr2YMCDShsVRWR+UgQxz1ZVWFG9B/hh+IBx/nQXaVOGBx sALl7YhKjR3srKQHZlIqJPC5jf913JjMjaX6IVZL87Ytsdf9KUjOuHsfhhTTbC/y59T4nKnB8 ytNB1vj8r6MDgDwMAZ77xjW+QIcGZ+o23Ls3tloMjWbAHSTSiqL2rlJWyFRf1NfljufOE0jVn tN9uXaRTgKkS/Yvs8Bav/D0MlSF1e9nNnYiIueQSQDVC32xNFZ4BXTiqs8I5rRrfXZpdWIPXr gQUJM/meuinSdAe+TrmYKmqlrDSJy50Z+hP2bBU4c5u75Gumc44LBpSLeNrrSCqtMCYoAYa7e C/jN4Usv4WvKMqtKAv5teWJAxkRoCMIW0G7C/RNKaMH/nagGKOcSsLz12xBFc4zJERM9Erj6K ZzVIbQsUWqQHfnfAiLJv88ywiF5YtOvv6rj+BPG5R/XC9nt1DEZ36nwZxlh9etxA5t2we7oZ2 ATkX2hCO X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,GIT_PATCH_0,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: --abmob-b35add18-3526-48ed-a289-966c37c11a10 Content-Type: text/plain; charset=UTF-8 Dear Fortranners, here's another patch that improves error receovery with references of bad array constructors leading to an ICE after a NULL pointer dereference. Original patch by Steve, which I amended with a logic cleanup. Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald --abmob-b35add18-3526-48ed-a289-966c37c11a10 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr105633.diff Content-Transfer-Encoding: quoted-printable =46rom 0da12c71a6ccbefa1456be5759974a4b450c78e6 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Wed, 19 Oct 2022 22:37:56 +0200 Subject: [PATCH] Fortran: error recovery with references of bad array constructors [PR105633] gcc/fortran/ChangeLog: PR fortran/105633 * expr.cc (find_array_section): Move check for NULL pointers so that both subscript triplets and vector subscripts are covered. gcc/testsuite/ChangeLog: PR fortran/105633 * gfortran.dg/pr105633.f90: New test. Co-authored-by: Steven G. Kargl =2D-- gcc/fortran/expr.cc | 10 +++++++--- gcc/testsuite/gfortran.dg/pr105633.f90 | 8 ++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr105633.f90 diff --git a/gcc/fortran/expr.cc b/gcc/fortran/expr.cc index 290ddf360c8..69d0b57c688 100644 =2D-- a/gcc/fortran/expr.cc +++ b/gcc/fortran/expr.cc @@ -1552,6 +1552,12 @@ find_array_section (gfc_expr *expr, gfc_ref *ref) lower =3D ref->u.ar.as->lower[d]; upper =3D ref->u.ar.as->upper[d]; + if (!lower || !upper) + { + t =3D false; + goto cleanup; + } + if (ref->u.ar.dimen_type[d] =3D=3D DIMEN_VECTOR) /* Vector subscri= pt. */ { gfc_constructor *ci; @@ -1594,9 +1600,7 @@ find_array_section (gfc_expr *expr, gfc_ref *ref) { if ((begin && begin->expr_type !=3D EXPR_CONSTANT) || (finish && finish->expr_type !=3D EXPR_CONSTANT) - || (step && step->expr_type !=3D EXPR_CONSTANT) - || !lower - || !upper) + || (step && step->expr_type !=3D EXPR_CONSTANT)) { t =3D false; goto cleanup; diff --git a/gcc/testsuite/gfortran.dg/pr105633.f90 b/gcc/testsuite/gfortr= an.dg/pr105633.f90 new file mode 100644 index 00000000000..f2dbc5e742a =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr105633.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/105633 - ICE in find_array_section +! Contributed by G.Steinmetz + +program p + integer, parameter :: a(:) =3D [1,2] ! { dg-error "deferred shape" } + print *, [a([1,2])] +end =2D- 2.35.3 --abmob-b35add18-3526-48ed-a289-966c37c11a10--