2004-08-24 Bud Davis <bdavis9659@comcast.net>

        PR fortran/17164
        * runtime/string_intrinsics.c (string_index):check for
        substring longer than string.
        * gfortran.dg/pr17164.f90: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86527 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 23fff49..ba02334 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-24  Bud Davis  <bdavis9659@comcast.net>
+
+       PR fortran/17164
+       * gfortran.dg/pr17164.f90: New test.
+
 2004-08-24  Zdenek Dvorak  <rakdver@atrey.karlin.mff.cuni.cz>
 
        * gcc.dg/tree-ssa/loop-1.c: New test.

diff --git a/gcc/testsuite/gfortran.dg/pr17164.f90 b/gcc/testsuite/gfortran.dg/pr17164.f90
new file mode 100644 (file)
index 0000000..0cfd994
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr17164.f90
@@ -0,0 +1,10 @@
+! pr17164
+! index aborts when substring is longer than string
+      implicit none
+      character*5 x
+      integer i
+      x='12345'
+      i=index(x,'blablabl')
+      if (i.ne.0) call abort
+      end
+

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 36b7069..1cb06dd 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-24  Bud Davis  <bdavis9659@comcast.net>
+
+       PR fortran/17164
+       * runtime/string_intrinsics.c (string_index):check for
+       substring longer than string.
+
 2004-08-24  David Edelsohn  <edelsohn@gnu.org>
 
        * Makefile.am (libgfortran_la_LDFLAGS): Add -lm.

diff --git a/libgfortran/intrinsics/string_intrinsics.c b/libgfortran/intrinsics/string_intrinsics.c
index 2cd07a2..5d23126 100644 (file)
--- a/libgfortran/intrinsics/string_intrinsics.c
+++ b/libgfortran/intrinsics/string_intrinsics.c
@@ -221,6 +221,9 @@ string_index (GFC_INTEGER_4 slen, const char * str, GFC_INTEGER_4 sslen,
   if (sslen == 0)
     return 1;
 
+  if (sslen > slen)
+    return 0;
+
   if (!back)
     {
       last = slen + 1 - sslen;