diff options
| author | fxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-31 20:15:22 +0000 |
|---|---|---|
| committer | fxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-10-31 20:15:22 +0000 |
| commit | 89f528df98c041a719fc7ccbf2f7dd0f8448cdb0 (patch) | |
| tree | 1024583b95a9dd9e2598bb3e446caa4624ef6e9f /gcc/fortran | |
| parent | 6b95ae38a6e40df1498dfdc0c3a8070507389a04 (diff) | |
| download | ppe42-gcc-89f528df98c041a719fc7ccbf2f7dd0f8448cdb0.tar.gz ppe42-gcc-89f528df98c041a719fc7ccbf2f7dd0f8448cdb0.zip | |
PR fortran/29067
* decl.c (gfc_set_constant_character_len): NULL-terminate the
character constant string.
* data.c (create_character_intializer): Likewise.
* expr.c (gfc_simplify_expr): NULL-terminate the substring
character constant.
* primary.c (match_hollerith_constant): NULL-terminate the
character constant string.
* gfortran.dg/pr29067.f: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118338 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/data.c | 3 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 3 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/primary.c | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c index 2ab6f507bbe..d53f92c4e20 100644 --- a/gcc/fortran/data.c +++ b/gcc/fortran/data.c @@ -155,7 +155,8 @@ create_character_intializer (gfc_expr * init, gfc_typespec * ts, init->expr_type = EXPR_CONSTANT; init->ts = *ts; - dest = gfc_getmem (len); + dest = gfc_getmem (len + 1); + dest[len] = '\0'; init->value.character.length = len; init->value.character.string = dest; /* Blank the string if we're only setting a substring. */ diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index e17e9e3436d..84797b7fdc0 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -754,10 +754,11 @@ gfc_set_constant_character_len (int len, gfc_expr * expr) slen = expr->value.character.length; if (len != slen) { - s = gfc_getmem (len); + s = gfc_getmem (len + 1); memcpy (s, expr->value.character.string, MIN (len, slen)); if (len > slen) memset (&s[slen], ' ', len - slen); + s[len] = '\0'; gfc_free (expr->value.character.string); expr->value.character.string = s; expr->value.character.length = len; diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 1f51fd09fca..d2da0d845c3 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1438,7 +1438,7 @@ gfc_simplify_expr (gfc_expr * p, int type) gfc_extract_int (p->ref->u.ss.end, &end); s = gfc_getmem (end - start + 1); memcpy (s, p->value.character.string + start, end - start); - s[end] = '\0'; /* TODO: C-style string for debugging. */ + s[end-start+1] = '\0'; /* TODO: C-style string for debugging. */ gfc_free (p->value.character.string); p->value.character.string = s; p->value.character.length = end - start; diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index 1dd8626d5cf..9982b614208 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -281,6 +281,7 @@ match_hollerith_constant (gfc_expr ** result) gfc_default_character_kind, &gfc_current_locus); e->value.character.string = gfc_getmem (num+1); memcpy (e->value.character.string, buffer, num); + e->value.character.string[num] = '\0'; e->value.character.length = num; *result = e; return MATCH_YES; |
