From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 391C03857354; Mon, 16 May 2022 19:11:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 391C03857354 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-10007] Fortran: fix error recovery on invalid array section X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 50c73234630d51e7d66986710afd1af23851002b X-Git-Newrev: 34c60e5e776d29ae6eb9e2e94af1c67666ec1caa Message-Id: <20220516191154.391C03857354@sourceware.org> Date: Mon, 16 May 2022 19:11:54 +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: Mon, 16 May 2022 19:11:54 -0000 https://gcc.gnu.org/g:34c60e5e776d29ae6eb9e2e94af1c67666ec1caa commit r11-10007-g34c60e5e776d29ae6eb9e2e94af1c67666ec1caa Author: Harald Anlauf Date: Tue May 10 23:41:57 2022 +0200 Fortran: fix error recovery on invalid array section gcc/fortran/ChangeLog: PR fortran/105230 * expr.c (find_array_section): Correct logic to avoid NULL pointer dereference on invalid array section. gcc/testsuite/ChangeLog: PR fortran/105230 * gfortran.dg/pr105230.f90: New test. Co-authored-by: Steven G. Kargl (cherry picked from commit 0acdbe29f66017fc5cca40dcbd72a0dd41491d07) Diff: --- gcc/fortran/expr.c | 4 ++-- gcc/testsuite/gfortran.dg/pr105230.f90 | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 68116da5d42..6f27b4bf440 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1592,8 +1592,8 @@ find_array_section (gfc_expr *expr, gfc_ref *ref) if ((begin && begin->expr_type != EXPR_CONSTANT) || (finish && finish->expr_type != EXPR_CONSTANT) || (step && step->expr_type != EXPR_CONSTANT) - || (!begin && !lower) - || (!finish && !upper)) + || !lower + || !upper) { t = false; goto cleanup; diff --git a/gcc/testsuite/gfortran.dg/pr105230.f90 b/gcc/testsuite/gfortran.dg/pr105230.f90 new file mode 100644 index 00000000000..6c6b42ef9bf --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr105230.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/105230 - ICE in find_array_section +! Contributed by G.Steinmetz + +program p + integer, parameter :: a(:) = [1, 2] ! { dg-error "deferred shape" } + print *, reshape([3, 4], a(1:2)) +end