diff options
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/intrinsics/string_intrinsics.c | 20 |
2 files changed, 18 insertions, 8 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 2305b3e9ed6..de3d574fea4 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2007-08-17 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + + PR fortran/33079 + * intrinsics/string_intrinsics.c (string_trim, string_minmax): Fix + the zero-length result case. + 2007-08-15 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> PR fortran/33077 diff --git a/libgfortran/intrinsics/string_intrinsics.c b/libgfortran/intrinsics/string_intrinsics.c index be028114476..c663daa6d86 100644 --- a/libgfortran/intrinsics/string_intrinsics.c +++ b/libgfortran/intrinsics/string_intrinsics.c @@ -77,6 +77,11 @@ export_proto(string_trim); extern void string_minmax (GFC_INTEGER_4 *, void **, int, int, ...); export_proto(string_minmax); + +/* Use for functions which can return a zero-length string. */ +static char zero_length_string = '\0'; + + /* Strings of unequal length are extended with pad characters. */ int @@ -167,16 +172,16 @@ string_trim (GFC_INTEGER_4 * len, void ** dest, GFC_INTEGER_4 slen, } *len = i + 1; - if (*len > 0) + if (*len == 0) + *dest = &zero_length_string; + else { /* Allocate space for result string. */ *dest = internal_malloc_size (*len); - /* copy string if necessary. */ + /* Copy string if necessary. */ memmove (*dest, src, *len); } - else - *dest = NULL; } @@ -403,14 +408,13 @@ string_minmax (GFC_INTEGER_4 *rlen, void **dest, int op, int nargs, ...) } va_end (ap); - if (*rlen > 0) + if (*rlen == 0) + *dest = &zero_length_string; + else { char * tmp = internal_malloc_size (*rlen); memcpy (tmp, res, reslen); memset (&tmp[reslen], ' ', *rlen - reslen); *dest = tmp; } - else - *dest = NULL; } - |