diff options
| -rw-r--r-- | gcc/fortran/data.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr70070.f90 | 8 |
2 files changed, 23 insertions, 0 deletions
diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c index 1313b33..13e3506 100644 --- a/gcc/fortran/data.c +++ b/gcc/fortran/data.c @@ -183,6 +183,19 @@ create_character_initializer (gfc_expr *init, gfc_typespec *ts, } } + if (start < 0) + { + gfc_error ("Substring start index at %L is less than one", + &ref->u.ss.start->where); + return NULL; + } + if (end > init->value.character.length) + { + gfc_error ("Substring end index at %L exceeds the string length", + &ref->u.ss.end->where); + return NULL; + } + if (rvalue->ts.type == BT_HOLLERITH) { for (size_t i = 0; i < (size_t) len; i++) @@ -576,6 +589,8 @@ gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index, if (lvalue->ts.u.cl->length == NULL && !(ref && ref->u.ss.length != NULL)) return false; expr = create_character_initializer (init, last_ts, ref, rvalue); + if (!expr) + return false; } else { diff --git a/gcc/testsuite/gfortran.dg/pr70070.f90 b/gcc/testsuite/gfortran.dg/pr70070.f90 new file mode 100644 index 0000000..04a6dd5 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr70070.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/70070 - ICE on initializing character data beyond min/max bound + +program p + character(1) :: a, b + data (a(i:i),i=0,0) /1*'#'/ ! { dg-error "Substring start index" } + data (b(i:i),i=2,3) /2*'#'/ ! { dg-error "Substring end index" } +end |