re PR fortran/50524 (*** glibc detected *** invalid free() pointer on illegal code...

2011-10-15  Steven G. Kargl  <kargl@gcc.gcu.org>

	PR fortran/50524
	* resolve.c (resolve_ref): Check return value of resolve_substring().

2011-10-15  Steven G. Kargl  <kargl@gcc.gcu.org>

	PR fortran/50524
	* gfortran.dg/substring_integer_index.f90: New test.

From-SVN: r180262

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4bfcec4df45be1ca8196c634e7f401d266442100..4f0246275ec39c376652bd08c375117feedb3c18 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/50524
+       * resolve.c (resolve_ref): Check return value of resolve_substring().
+
 2011-10-30  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        * 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 0d7e03056b97dea402b43bf63c03fb5689043d1b..30f5f55e21434dd90474fc9d66c2317786f997ad 100644 (file)
--- 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 1e4f7efac592b31d63acbca46f79691a2ca675db..5da63c43ca1c5fdf4b6c46ff7dded718592eb17a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-20  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/50524
+       * gfortran.dg/substring_integer_index.f90: New test.
+
 2011-10-20  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        * 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 (file)
index 0000000..a730a75
--- /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
+