re PR fortran/70068 (ICE: out of memory on involving empty substring)

2018-03-24  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/70068
	* expr.c (find_substring_ref): Change types of start, end
	and length variables to gfc_charlen_t. Set length to zero
	for empty substring.

2018-03-24  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/70068
	* gfortran.dg/substr_7.f90: New test.

From-SVN: r258835

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2cf32f3a41526f99a7935d02812e9cc038527eff..12348f1674d9372fc2065e01c54e9f6c9fc28eda 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2018-03-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/70068
+       * expr.c (find_substring_ref): Change types of start, end
+       and length variables to gfc_charlen_t. Set length to zero
+       for empty substring.
+
 2018-03-24  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/42651

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index bbaabb684c9b433e6dad9b07746f7bbaef136881..9e113d26a59311c85f5356c5eed46860217431f4 100644 (file)
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -1662,9 +1662,9 @@ cleanup:
 static bool
 find_substring_ref (gfc_expr *p, gfc_expr **newp)
 {
-  int end;
-  int start;
-  int length;
+  gfc_charlen_t end;
+  gfc_charlen_t start;
+  gfc_charlen_t length;
   gfc_char_t *chr;
 
   if (p->ref->u.ss.start->expr_type != EXPR_CONSTANT
@@ -1674,9 +1674,12 @@ find_substring_ref (gfc_expr *p, gfc_expr **newp)
   *newp = gfc_copy_expr (p);
   free ((*newp)->value.character.string);
 
-  end = (int) mpz_get_ui (p->ref->u.ss.end->value.integer);
-  start = (int) mpz_get_ui (p->ref->u.ss.start->value.integer);
-  length = end - start + 1;
+  end = (gfc_charlen_t) mpz_get_ui (p->ref->u.ss.end->value.integer);
+  start = (gfc_charlen_t) mpz_get_ui (p->ref->u.ss.start->value.integer);
+  if (end >= start)
+    length = end - start + 1;
+  else
+    length = 0;
 
   chr = (*newp)->value.character.string = gfc_get_wide_string (length + 1);
   (*newp)->value.character.length = length;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 962711c286884ef7c7d57897a219d0ff0c3a8cbe..1e1f51566b84574ccc47682b9540f40c4b3650ad 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-24  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/70068
+       * gfortran.dg/substr_7.f90: New test.
+
 2018-03-24  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/42651

diff --git a/gcc/testsuite/gfortran.dg/substr_7.f90 b/gcc/testsuite/gfortran.dg/substr_7.f90
new file mode 100644 (file)
index 0000000..3d8f2e1
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/substr_7.f90
@@ -0,0 +1,13 @@
+! { dg-do  run }
+! PR 70068 - used to allocate too much memory
+! Original test cases by Gerhard Steinmetz
+program p
+   integer :: i
+   character(3), parameter :: x(3) = ['abc', 'ijk', 'xyz']
+   character(3) :: y(2)
+   character(99), parameter :: x2(2) = ' '
+   character(99), parameter :: y2=x(2)(99:1)
+   y = [(x(i)(i:1), i=2,3)]
+   if (any(y /= '')) stop 1
+   if (y2 /= '') stop 2
+end