diff options
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/io/list_read.c | 10 | ||||
| -rw-r--r-- | libgfortran/io/transfer.c | 20 | ||||
| -rw-r--r-- | libgfortran/io/write.c | 10 |
3 files changed, 24 insertions, 16 deletions
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c index 707afae..e38e9a8 100644 --- a/libgfortran/io/list_read.c +++ b/libgfortran/io/list_read.c @@ -2268,9 +2268,10 @@ list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p, !(dtp->common.flags & IOPARM_HAS_IOSTAT)) { char message[IOMSG_LEN + 1]; - child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg) + 1; + child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg); free_line (dtp); - snprintf (message, child_iomsg_len, child_iomsg); + fstrcpy (message, child_iomsg_len, child_iomsg, child_iomsg_len); + message[child_iomsg_len] = '\0'; generate_error (&dtp->common, dtp->u.p.child_saved_iostat, message); } @@ -3082,8 +3083,9 @@ nml_read_obj (st_parameter_dt *dtp, namelist_info *nl, index_type offset, !(dtp->common.flags & IOPARM_HAS_IOSTAT)) { char message[IOMSG_LEN + 1]; - child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg) + 1; - snprintf (message, child_iomsg_len, child_iomsg); + child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg); + fstrcpy (message, child_iomsg_len, child_iomsg, child_iomsg_len); + message[child_iomsg_len] = '\0'; generate_error (&dtp->common, dtp->u.p.child_saved_iostat, message); goto nml_err_ret; diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c index 9523a14..a86099d 100644 --- a/libgfortran/io/transfer.c +++ b/libgfortran/io/transfer.c @@ -1128,8 +1128,9 @@ unformatted_read (st_parameter_dt *dtp, bt type, !(dtp->common.flags & IOPARM_HAS_IOSTAT)) { char message[IOMSG_LEN + 1]; - child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg) + 1; - snprintf (message, child_iomsg_len, child_iomsg); + child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg); + fstrcpy (message, child_iomsg_len, child_iomsg, child_iomsg_len); + message[child_iomsg_len] = '\0'; generate_error (&dtp->common, dtp->u.p.child_saved_iostat, message); } @@ -1271,8 +1272,9 @@ unformatted_write (st_parameter_dt *dtp, bt type, !(dtp->common.flags & IOPARM_HAS_IOSTAT)) { char message[IOMSG_LEN + 1]; - child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg) + 1; - snprintf (message, child_iomsg_len, child_iomsg); + child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg); + fstrcpy (message, child_iomsg_len, child_iomsg, child_iomsg_len); + message[child_iomsg_len] = '\0'; generate_error (&dtp->common, dtp->u.p.child_saved_iostat, message); } @@ -1763,8 +1765,9 @@ formatted_transfer_scalar_read (st_parameter_dt *dtp, bt type, void *p, int kind !(dtp->common.flags & IOPARM_HAS_IOSTAT)) { char message[IOMSG_LEN + 1]; - child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg) + 1; - snprintf (message, child_iomsg_len, child_iomsg); + child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg); + fstrcpy (message, child_iomsg_len, child_iomsg, child_iomsg_len); + message[child_iomsg_len] = '\0'; generate_error (&dtp->common, dtp->u.p.child_saved_iostat, message); } @@ -2259,8 +2262,9 @@ formatted_transfer_scalar_write (st_parameter_dt *dtp, bt type, void *p, int kin !(dtp->common.flags & IOPARM_HAS_IOSTAT)) { char message[IOMSG_LEN + 1]; - child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg) + 1; - snprintf (message, child_iomsg_len, child_iomsg); + child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg); + fstrcpy (message, child_iomsg_len, child_iomsg, child_iomsg_len); + message[child_iomsg_len] = '\0'; generate_error (&dtp->common, dtp->u.p.child_saved_iostat, message); } diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c index cdcaf8d..91d1da2 100644 --- a/libgfortran/io/write.c +++ b/libgfortran/io/write.c @@ -1999,8 +1999,9 @@ list_formatted_write_scalar (st_parameter_dt *dtp, bt type, void *p, int kind, !(dtp->common.flags & IOPARM_HAS_IOSTAT)) { char message[IOMSG_LEN + 1]; - child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg) + 1; - snprintf (message, child_iomsg_len, child_iomsg); + child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg); + fstrcpy (message, child_iomsg_len, child_iomsg, child_iomsg_len); + message[child_iomsg_len] = '\0'; generate_error (&dtp->common, dtp->u.p.child_saved_iostat, message); } @@ -2352,8 +2353,9 @@ nml_write_obj (st_parameter_dt *dtp, namelist_info *obj, index_type offset, char message[IOMSG_LEN + 1]; /* Trim trailing spaces from the message. */ - child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg) + 1; - snprintf (message, child_iomsg_len, child_iomsg); + child_iomsg_len = string_len_trim (IOMSG_LEN, child_iomsg); + fstrcpy (message, child_iomsg_len, child_iomsg, child_iomsg_len); + message[child_iomsg_len] = '\0'; generate_error (&dtp->common, dtp->u.p.child_saved_iostat, message); } |