Changeset 39438

Timestamp:

Mar 6, 2016, 8:55:29 PM (10 years ago)

Author:

eugene

Message:

plug memleaks

Location:

branches/eam_branches/ohana.20160226/src/libdvo/src

Files:

• AstromOffsetMapIO.c (modified) (4 diffs)
• HostTable.c (modified) (2 diffs)
• RegionHostTable.c (modified) (1 diff)
• mosaic_astrom.c (modified) (1 diff)

branches/eam_branches/ohana.20160226/src/libdvo/src/AstromOffsetMapIO.c

@@ -77 +77 @@
     }
     AstromOffsetTableSetIDs (table);
-    gfits_free_header (ftable.header);
+
+    gfits_free_header (&theader);
     gfits_free_table  (&ftable);
   } else {
@@ -98 +99 @@
     // Convert the disk array of maps to then internal format in a rich structure:
     table = AstromOffsetMapToTable (map_disk, Nmap);
+
+    gfits_free_header (&theader);
     gfits_free_table  (&ftable);
   }
 
-  gfits_free_header (&theader);
+  gfits_free_header (&header);
   gfits_free_matrix (&matrix);
   fclose (f);
@@ -131 +134 @@
   ftable.header = &theader;
   gfits_table_set_AstromOffsetMap_Disk_6x6 (&ftable, map_disk, Nmap, TRUE);
+  FREE (map_disk);
 
   f = fopen (filename, "w");
@@ -143 +147 @@
   gfits_fwrite_table  (f, &ftable);
   fclose (f);
+
+  gfits_free_header (&header);
+  gfits_free_matrix (&matrix);
+  gfits_free_header (&theader);
+  gfits_free_table  (&ftable);
 
   return (TRUE);

branches/eam_branches/ohana.20160226/src/libdvo/src/HostTable.c

@@ -27 +27 @@
   int i;
   for (i = 0; i < Nhosts; i++) {
-    free (hosts[i].hostname);
-    free (hosts[i].pathname);
+    FREE (hosts[i].hostname);
+    FREE (hosts[i].pathname);
+    FREE (hosts[i].results);
     FreeIOBuffer (&hosts[i].stdout);
     FreeIOBuffer (&hosts[i].stderr);
@@ -43 +44 @@
   }
   if (table->index) free (table->index);
+
   free (table);
   return;

branches/eam_branches/ohana.20160226/src/libdvo/src/RegionHostTable.c

@@ -42 +42 @@
   for (i = 0; i < Nhosts; i++) {
     free (hosts[i].hostname);
+    FreeIOBuffer (&hosts[i].stdout);
+    FreeIOBuffer (&hosts[i].stderr);
+    FREE (hosts[i].image);
+    FREE (hosts[i].imseq);
+    FREE (hosts[i].neighbors);
   }
   free (hosts);

branches/eam_branches/ohana.20160226/src/libdvo/src/mosaic_astrom.c

@@ -64 +64 @@
     images[i].coords.mosaic = &images[j].coords;
   }
+
+  free (DISentry);
+  free (DIStzero);
+
   return (TRUE);
 }