diff mbox

[COMMITTED] libgfortran Fix a few memory leaks

Message ID 565e5ec8-f049-ce0b-0f40-7bed5ae9c684@charter.net
State New
Headers show

Commit Message

Jerry DeLisle Oct. 21, 2016, 1:43 a.m. UTC 
While investigating PR70855 I found a few minor issues.

Attached patch regression tested on x86-64-linux,

	M	libgfortran/ChangeLog
	M	libgfortran/io/transfer.c
Committed r241392

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.
diff mbox

Patch

diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 1f46ca64..0879ca7a 100644
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -3783,7 +3783,14 @@  finalize_transfer (st_parameter_dt *dtp)
      }

    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)
      *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);
  	  dtp->u.p.current_unit->filename = NULL;
-	  free_format_hash_table (dtp->u.p.current_unit);
  	  free (dtp->u.p.current_unit->s);
  	  dtp->u.p.current_unit->s = NULL;
  	  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);
  	  dtp->u.p.current_unit->filename = NULL;
-	  free_format_hash_table (dtp->u.p.current_unit);
  	  free (dtp->u.p.current_unit->s);
  	  dtp->u.p.current_unit->s = NULL;
  	  if (dtp->u.p.current_unit->ls)