aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/array.c
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2019-10-22 18:18:59 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2019-10-22 18:18:59 +0000
commitebb3afe2b98a9a4b1c8cc5fd2745a1037c06d827 (patch)
tree4e4e62cda2e1b3490017269ea71f050964e445a5 /gcc/fortran/array.c
parent1ee4c3da8668d913419209d484a7cb5a03e7b1fb (diff)
downloadgcc-ebb3afe2b98a9a4b1c8cc5fd2745a1037c06d827.zip
gcc-ebb3afe2b98a9a4b1c8cc5fd2745a1037c06d827.tar.gz
gcc-ebb3afe2b98a9a4b1c8cc5fd2745a1037c06d827.tar.bz2
re PR fortran/92174 (runtime error: index 15 out of bounds for type 'gfc_expr *[15])
2019-10-22 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/92174 * decl.c (attr_decl1): Move check for F2018:C822 from here ... * array.c (gfc_set_array_spec): ... to here. From-SVN: r277297
Diffstat (limited to 'gcc/fortran/array.c')
-rw-r--r--gcc/fortran/array.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 427110b..f0980dd 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -862,6 +862,10 @@ gfc_set_array_spec (gfc_symbol *sym, gfc_array_spec *as, locus *error_loc)
sym->as->cotype = as->cotype;
sym->as->corank = as->corank;
+ /* Check F2018:C822. */
+ if (sym->as->rank + sym->as->corank > GFC_MAX_DIMENSIONS)
+ goto too_many;
+
for (i = 0; i < as->corank; i++)
{
sym->as->lower[sym->as->rank + i] = as->lower[i];
@@ -880,6 +884,10 @@ gfc_set_array_spec (gfc_symbol *sym, gfc_array_spec *as, locus *error_loc)
sym->as->cray_pointee = as->cray_pointee;
sym->as->cp_was_assumed = as->cp_was_assumed;
+ /* Check F2018:C822. */
+ if (sym->as->rank + sym->as->corank > GFC_MAX_DIMENSIONS)
+ goto too_many;
+
for (i = 0; i < sym->as->corank; i++)
{
sym->as->lower[as->rank + i] = sym->as->lower[i];
@@ -894,6 +902,12 @@ gfc_set_array_spec (gfc_symbol *sym, gfc_array_spec *as, locus *error_loc)
free (as);
return true;
+
+too_many:
+
+ gfc_error ("rank + corank of %qs exceeds %d at %C", sym->name,
+ GFC_MAX_DIMENSIONS);
+ return false;
}