From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 93CD43857356; Mon, 16 May 2022 20:05:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93CD43857356 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 r9-10187] Fortran: improve error recovery on invalid array section X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: f43db17894744827d93ddcea7952d4ecf1f83f30 X-Git-Newrev: 6b8cd1fb402163e16d2a139f4bee346ff0c8f234 Message-Id: <20220516200542.93CD43857356@sourceware.org> Date: Mon, 16 May 2022 20:05:42 +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 20:05:42 -0000 https://gcc.gnu.org/g:6b8cd1fb402163e16d2a139f4bee346ff0c8f234 commit r9-10187-g6b8cd1fb402163e16d2a139f4bee346ff0c8f234 Author: Harald Anlauf Date: Wed Mar 9 21:58:26 2022 +0100 Fortran: improve error recovery on invalid array section gcc/fortran/ChangeLog: PR fortran/104849 * expr.c (find_array_section): Avoid NULL pointer dereference on invalid array section. gcc/testsuite/ChangeLog: PR fortran/104849 * gfortran.dg/pr104849.f90: New test. (cherry picked from commit 22015e77d3e45306077396b9de8a8a28bb67fb20) Diff: --- gcc/fortran/expr.c | 4 +++- gcc/testsuite/gfortran.dg/pr104849.f90 | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 7b61488bfe9..4276fe62c61 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1552,7 +1552,9 @@ 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)) + || (step && step->expr_type != EXPR_CONSTANT) + || (!begin && !lower) + || (!finish && !upper)) { t = false; goto cleanup; diff --git a/gcc/testsuite/gfortran.dg/pr104849.f90 b/gcc/testsuite/gfortran.dg/pr104849.f90 new file mode 100644 index 00000000000..ae221b5ba10 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr104849.f90 @@ -0,0 +1,9 @@ +! { dg-do compile } +! PR fortran/104849 - ICE in find_array_section +! Contributed by G.Steinmetz + +program p + integer, parameter :: a(:) = [1, 2] ! { dg-error "deferred shape" } + integer :: x(2) + data x /a(:)/ ! { dg-error "Invalid" } +end