public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Harald Anlauf <anlauf@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r11-10006] Fortran: improve error recovery on invalid array section
Date: Mon, 16 May 2022 19:11:48 +0000 (GMT)	[thread overview]
Message-ID: <20220516191148.F36103858D3C@sourceware.org> (raw)

https://gcc.gnu.org/g:50c73234630d51e7d66986710afd1af23851002b

commit r11-10006-g50c73234630d51e7d66986710afd1af23851002b
Author: Harald Anlauf <anlauf@gmx.de>
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 edacd974a21..68116da5d42 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -1591,7 +1591,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


                 reply	other threads:[~2022-05-16 19:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220516191148.F36103858D3C@sourceware.org \
    --to=anlauf@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).