diff options
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index af4b5e9..6e5e492 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2006-06-24 Francois-Xavier Coudert <coudert@clipper.ens.fr> + PR fortran/28081 + * resolve.c (resolve_substring): Don't issue out-of-bounds + error messages when the range has zero size. + +2006-06-24 Francois-Xavier Coudert <coudert@clipper.ens.fr> + PR fortran/23862 * lang-specs.h (f95-cpp-input): Pass -ffree-form to f951 unless -ffixed-form is explicitly specified. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 384b5a4..fe37f2c 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -2542,7 +2542,9 @@ resolve_substring (gfc_ref * ref) return FAILURE; } - if (compare_bound_int (ref->u.ss.start, 1) == CMP_LT) + if (compare_bound_int (ref->u.ss.start, 1) == CMP_LT + && (compare_bound (ref->u.ss.end, ref->u.ss.start) == CMP_EQ + || compare_bound (ref->u.ss.end, ref->u.ss.start) == CMP_GT)) { gfc_error ("Substring start index at %L is less than one", &ref->u.ss.start->where); @@ -2570,9 +2572,11 @@ resolve_substring (gfc_ref * ref) } if (ref->u.ss.length != NULL - && compare_bound (ref->u.ss.end, ref->u.ss.length->length) == CMP_GT) + && compare_bound (ref->u.ss.end, ref->u.ss.length->length) == CMP_GT + && (compare_bound (ref->u.ss.end, ref->u.ss.start) == CMP_EQ + || compare_bound (ref->u.ss.end, ref->u.ss.start) == CMP_GT)) { - gfc_error ("Substring end index at %L is out of bounds", + gfc_error ("Substring end index at %L exceeds the string length", &ref->u.ss.start->where); return FAILURE; } |