From: Steve Kargl <sgk@troutmask.apl.washington.edu>
To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [PATCH] PR fortran/69395 -- don't exceed max allowed array dimensions
Date: Thu, 15 Mar 2018 01:24:00 -0000 [thread overview]
Message-ID: <20180315012356.GA51103@troutmask.apl.washington.edu> (raw)
[-- Attachment #1: Type: text/plain, Size: 470 bytes --]
The attachedi patch detects situations where the sum of
an array's rank and corank exceeds the maximum allowed
by the Standard. Regression tested on x86_64-*-freebsd.
2018-03-14 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/69395
* decl.c (merge_array_spec): Limit the merging to maximum allowed
dimensions, and issue error message if limit is exceeded.
2018-03-14 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/69395
* gfortran.dg/pr69395.f90
--
Steve
[-- Attachment #2: pr69395.diff --]
[-- Type: text/x-diff, Size: 2442 bytes --]
Index: gcc/fortran/decl.c
===================================================================
--- gcc/fortran/decl.c (revision 258537)
+++ gcc/fortran/decl.c (working copy)
@@ -804,7 +804,7 @@ cleanup:
static bool
merge_array_spec (gfc_array_spec *from, gfc_array_spec *to, bool copy)
{
- int i;
+ int i, j;
if ((from->type == AS_ASSUMED_RANK && to->corank)
|| (to->type == AS_ASSUMED_RANK && from->corank))
@@ -822,8 +822,14 @@ merge_array_spec (gfc_array_spec *from, gfc_array_spec
for (i = 0; i < to->corank; i++)
{
- to->lower[from->rank + i] = to->lower[i];
- to->upper[from->rank + i] = to->upper[i];
+ /* Do not exceed the limits on lower[] and upper[]. gfortran
+ cleans up elsewhere. */
+ j = from->rank + i;
+ if (j >= GFC_MAX_DIMENSIONS)
+ break;
+
+ to->lower[j] = to->lower[i];
+ to->upper[j] = to->upper[i];
}
for (i = 0; i < from->rank; i++)
{
@@ -846,19 +852,33 @@ merge_array_spec (gfc_array_spec *from, gfc_array_spec
for (i = 0; i < from->corank; i++)
{
+ /* Do not exceed the limits on lower[] and upper[]. gfortran
+ cleans up elsewhere. */
+ j = to->rank + i;
+ if (j >= GFC_MAX_DIMENSIONS)
+ break;
+
if (copy)
{
- to->lower[to->rank + i] = gfc_copy_expr (from->lower[i]);
- to->upper[to->rank + i] = gfc_copy_expr (from->upper[i]);
+ to->lower[j] = gfc_copy_expr (from->lower[i]);
+ to->upper[j] = gfc_copy_expr (from->upper[i]);
}
else
{
- to->lower[to->rank + i] = from->lower[i];
- to->upper[to->rank + i] = from->upper[i];
+ to->lower[j] = from->lower[i];
+ to->upper[j] = from->upper[i];
}
}
}
+ if (to->rank + to->corank >= GFC_MAX_DIMENSIONS)
+ {
+ gfc_error ("Sum of array rank %d and corank %d at %C exceeds maximum "
+ "allowed dimensions of %d",
+ to->rank, to->corank, GFC_MAX_DIMENSIONS);
+ to->corank = GFC_MAX_DIMENSIONS - to->rank;
+ return false;
+ }
return true;
}
Index: gcc/testsuite/gfortran.dg/pr69395.f90
===================================================================
--- gcc/testsuite/gfortran.dg/pr69395.f90 (nonexistent)
+++ gcc/testsuite/gfortran.dg/pr69395.f90 (working copy)
@@ -0,0 +1,5 @@
+! { dg-do compile }
+! { dg-options "-fcoarray=single" }
+program p
+real, dimension(1,2,1,2,1,2,1,2), codimension[1,2,1,2,1,2,1,*] :: z ! { dg-error "allowed dimensions" }
+end
next reply other threads:[~2018-03-15 1:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 1:24 Steve Kargl [this message]
2018-03-15 20:21 ` Thomas Koenig
2018-03-16 1:06 ` Jerry DeLisle
2018-03-16 10:46 Dominique d'Humières
2018-03-16 14:49 ` Steve Kargl
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=20180315012356.GA51103@troutmask.apl.washington.edu \
--to=sgk@troutmask.apl.washington.edu \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@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).