diff options
| author | Francois-Xavier Coudert <coudert@clipper.ens.fr> | 2006-11-04 21:58:26 +0100 |
|---|---|---|
| committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2006-11-04 20:58:26 +0000 |
| commit | d6910bb551f6d41b9e631d21f3fa3899f65757ab (patch) | |
| tree | 854baedab5fff3b2ca5cb60f092346ba2f14ff0f /gcc | |
| parent | c5289e454b2097834bece1843af3bb1f6758eac3 (diff) | |
| download | gcc-d6910bb551f6d41b9e631d21f3fa3899f65757ab.zip gcc-d6910bb551f6d41b9e631d21f3fa3899f65757ab.tar.gz gcc-d6910bb551f6d41b9e631d21f3fa3899f65757ab.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr29713.f90 | 6 |
4 files changed, 18 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 800ba51..64d3baf 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 d2da0d8..486da13 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 1949db1..6ca95da 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 0000000..be4accd --- /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 |