diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2016-01-13 14:27:57 +0100 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2016-01-13 14:27:57 +0100 |
| commit | d8e1f79a80caf5b40088476b15b29925c0a42348 (patch) | |
| tree | e874dcd41321f2d982cb3320784d2b5ea127ec34 /libgfortran | |
| parent | 428ded17977c8142625804eb8f7545ae7bb06f7b (diff) | |
Merge branches/gcc-5-branch rev 232321.
Change-Id: I69778250351f56596e2aa93cbd9fe5ee12b54548
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/io/format.c | 20 |
2 files changed, 6 insertions, 20 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 7a186377f79..ebf3d4ad274 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2015-12-29 Jerry DeLisle <jvdelisle@gcc.gnu.org> + + Backport from trunk + PR libfortran/68987 + io/format.c (format_error): Remove unneeded memory cleanup. + 2015-12-05 Juoko Orava <jouko.orava@iki.fi> PR fortran/50201 diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c index 42be2586e1f..6ef029a6d41 100644 --- a/libgfortran/io/format.c +++ b/libgfortran/io/format.c @@ -1171,26 +1171,6 @@ format_error (st_parameter_dt *dtp, const fnode *f, const char *message) *p++ = '^'; *p = '\0'; - /* Cleanup any left over memory allocations before calling generate - error. */ - if (is_internal_unit (dtp)) - { - if (dtp->format != NULL) - { - free (dtp->format); - dtp->format = NULL; - } - - /* Leave these alone if IOSTAT was given because execution will - return from generate error in those cases. */ - if (!(dtp->common.flags & IOPARM_HAS_IOSTAT)) - { - free (dtp->u.p.fmt); - free_format_hash_table (dtp->u.p.current_unit); - free_internal_unit (dtp); - } - } - generate_error (&dtp->common, LIBERROR_FORMAT, buffer); } |