git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

transfer.c (finalize_transfer): Free format data in child procedures. 

2016-10-20  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	* io/transfer.c (finalize_transfer): Free format data in child
	procedures. (st_read_done, st_write_done): Don't free format
	hash table.

From-SVN: r241392
This commit is contained in:
Jerry DeLisle 2016-10-21 01:41:03 +00:00
parent 2b1c40345d
commit bdff7e518b
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libgfortran/ChangeLog
View File

@ -1,10 +1,16 @@
2016-10-20 Jerry DeLisle <jvdelisle@gcc.gnu.org>
* io/transfer.c (finalize_transfer): Free format data in child
procedures. (st_read_done, st_write_done): Don't free format
hash table.
2016-10-17 Jerry DeLisle <jvdelisle@gcc.gnu.org> 2016-10-17 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/48298 PR fortran/48298
* io/io.h: Move size_used from dtp to unit structure. Add bool * io/io.h: Move size_used from dtp to unit structure. Add bool
has_size to unit structure. has_size to unit structure.
* read.c (read_x): Use has_size and size_used. * io/read.c (read_x): Use has_size and size_used.
* transfer.c (read_sf_internal,read_sf,read_block_form, * io/transfer.c (read_sf_internal,read_sf,read_block_form,
read_block_form4): Likewise. read_block_form4): Likewise.
(data_transfer_init): If parent, initialize the size variables. (data_transfer_init): If parent, initialize the size variables.
(finalize_transfer): Set the size variable using size_used in (finalize_transfer): Set the size variable using size_used in

11
libgfortran/io/transfer.c
View File

@ -3783,7 +3783,14 @@ finalize_transfer (st_parameter_dt *dtp)
} }
if (dtp->u.p.current_unit && (dtp->u.p.current_unit->child_dtio > 0)) if (dtp->u.p.current_unit && (dtp->u.p.current_unit->child_dtio > 0))
return; {
if (cf & IOPARM_DT_HAS_FORMAT)
{
free (dtp->u.p.fmt);
free (dtp->format);
}
return;
}
if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0) if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0)
*dtp->size = dtp->u.p.current_unit->size_used; *dtp->size = dtp->u.p.current_unit->size_used;
@ -3972,7 +3979,6 @@ st_read_done (st_parameter_dt *dtp)
{ {
free (dtp->u.p.current_unit->filename); free (dtp->u.p.current_unit->filename);
dtp->u.p.current_unit->filename = NULL; dtp->u.p.current_unit->filename = NULL;
free_format_hash_table (dtp->u.p.current_unit);
free (dtp->u.p.current_unit->s); free (dtp->u.p.current_unit->s);
dtp->u.p.current_unit->s = NULL; dtp->u.p.current_unit->s = NULL;
if (dtp->u.p.current_unit->ls) if (dtp->u.p.current_unit->ls)
@ -4043,7 +4049,6 @@ st_write_done (st_parameter_dt *dtp)
{ {
free (dtp->u.p.current_unit->filename); free (dtp->u.p.current_unit->filename);
dtp->u.p.current_unit->filename = NULL; dtp->u.p.current_unit->filename = NULL;
free_format_hash_table (dtp->u.p.current_unit);
free (dtp->u.p.current_unit->s); free (dtp->u.p.current_unit->s);
dtp->u.p.current_unit->s = NULL; dtp->u.p.current_unit->s = NULL;
if (dtp->u.p.current_unit->ls) if (dtp->u.p.current_unit->ls)