From: Francois-Xavier Coudert <coudert@clipper.ens.fr>
Date: Sat, 4 Nov 2006 20:58:26 +0000 (+0100)
Subject: re PR fortran/29713 (ICE in gfc_set_constant_character_len decl.c:762)
X-Git-Tag: releases/gcc-4.3.0~8631
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6910bb551f6d41b9e631d21f3fa3899f65757ab;p=thirdparty%2Fgcc.git

re PR fortran/29713 (ICE in gfc_set_constant_character_len decl.c:762)

	PR fortran/29713

	* expr.c (gfc_simplify_expr): Correct memory allocation.

	* gfortran.dg/pr29713.f90: New test.

From-SVN: r118483
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 800ba511f2a2..64d3bafa8d48 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-04  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+	PR fortran/29713
+	* expr.c (gfc_simplify_expr): Correct memory allocation.
+
 2006-11-02  Brooks Moses  <brooks.moses@codesourcery.com>
 
 	* error.c (show_locus): Remove "In file" from error messages.
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index d2da0d845c35..486da131d893 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -1436,7 +1436,7 @@ gfc_simplify_expr (gfc_expr * p, int type)
 	  gfc_extract_int (p->ref->u.ss.start, &start);
 	  start--;  /* Convert from one-based to zero-based.  */
 	  gfc_extract_int (p->ref->u.ss.end, &end);
-	  s = gfc_getmem (end - start + 1);
+	  s = gfc_getmem (end - start + 2);
 	  memcpy (s, p->value.character.string + start, end - start);
 	  s[end-start+1] = '\0';  /* TODO: C-style string for debugging.  */
 	  gfc_free (p->value.character.string);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1949db13719d..6ca95da9743a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-04  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+	PR libfortran/29713
+	* gfortran.dg/pr29713.f90: New test.
+
 2006-11-03  J"orn Rennecke  <joern.rennecke@st.com>
 
 	* testsuite/gcc.c-torture/execute/arith-rand-ll.c:
@@ -6,8 +11,7 @@
 2006-11-03  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
 	PR libfortran/27895
-	* gcc/testsuite/gfortran.dg/zero_sized_1.f90: Uncomment checks
-	for RESHAPE.
+	* gfortran.dg/zero_sized_1.f90: Uncomment checks for RESHAPE.
 
 2006-11-02  Brooks Moses  <brooks.moses@codesourcery.com>
 
diff --git a/gcc/testsuite/gfortran.dg/pr29713.f90 b/gcc/testsuite/gfortran.dg/pr29713.f90
new file mode 100644
index 000000000000..be4accd6edd7
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr29713.f90
@@ -0,0 +1,6 @@
+! { dg-do compile }
+      character*2 a
+      character*4 b
+      parameter (a="12")
+      parameter (b = a(1:2))
+      end