From 86daf6d59d37755f3b73a10bb489e53f6c224a8c Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Thu, 20 Oct 2011 17:15:06 +0000 Subject: [PATCH] re PR fortran/50524 (*** glibc detected *** invalid free() pointer on illegal code (r178939)) 2011-10-15 Steven G. Kargl PR fortran/50524 * resolve.c (resolve_ref): Check return value of resolve_substring(). 2011-10-15 Steven G. Kargl PR fortran/50524 * gfortran.dg/substring_integer_index.f90: New test. From-SVN: r180262 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/resolve.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/substring_integer_index.f90 | 8 ++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/substring_integer_index.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4bfcec4df45b..4f0246275ec3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2011-10-30 Steven G. Kargl + + PR fortran/50524 + * resolve.c (resolve_ref): Check return value of resolve_substring(). + 2011-10-30 Steven G. Kargl * io.c (match_dt_format): Match a user-defined operator or a kind diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 0d7e03056b97..30f5f55e2143 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -4846,7 +4846,8 @@ resolve_ref (gfc_expr *expr) break; case REF_SUBSTRING: - resolve_substring (ref); + if (resolve_substring (ref) == FAILURE) + return FAILURE; break; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1e4f7efac592..5da63c43ca1c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-10-20 Steven G. Kargl + + PR fortran/50524 + * gfortran.dg/substring_integer_index.f90: New test. + 2011-10-20 Steven G. Kargl * gfortran.dg/format_string.f: New test. diff --git a/gcc/testsuite/gfortran.dg/substring_integer_index.f90 b/gcc/testsuite/gfortran.dg/substring_integer_index.f90 new file mode 100644 index 000000000000..a730a75f36b8 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/substring_integer_index.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/50524 +! +program foo + print *, 'abc'(2.e0:3) ! { dg-error "must be of type INTEGER" } + print *,'qwe'(1:1e0) ! { dg-error "must be of type INTEGER" } +end program foo + -- 2.47.2