Changeset 7974

Timestamp:

Jul 25, 2006, 8:14:34 AM (20 years ago)

Author:

eugene

Message:

fixed memory leak issues

Location:

trunk/Ohana/src/addstar

Files:

• include/addstar.h (modified) (1 diff)
• src/SkyTableFromTychoIndex.c (modified) (1 diff)
• src/addstar.c (modified) (3 diffs)
• src/wcatalog.c (modified) (2 diffs)

trunk/Ohana/src/addstar/include/addstar.h

@@ -163 +163 @@
 void       update_coords          PROTO((Average *average, Measure *measure, int *next));
 void       wcatalog               PROTO((Catalog *catalog));
+void       free_catalog           PROTO((Catalog *catalog));
 void       wimage                 PROTO((FITS_DB *db, Image *image));
 void       create_image_db        PROTO((FITS_DB *db));

trunk/Ohana/src/addstar/src/SkyTableFromTychoIndex.c

@@ -137 +137 @@
   }
 
+  free (tycho);
+
   ALLOCATE (skytable, SkyTable, 1);
   skytable[0].regions = regions;

trunk/Ohana/src/addstar/src/addstar.c

@@ -4 +4 @@
 
   int Nm, Na, Ns, status;
-  int i, Nstars, Nimage, Noverlap, Nsubset, Naverage, Nmeasure;
+  int i, Nstars, Nimage, Noverlap, Nsubset;
+  unsigned long long Naverage, Nmeasure;
   Stars *stars, **subset;
   Image image, *imageSet, *overlap;
@@ -99 +100 @@
     if ((catalog.Nave_disk == 0) && options.only_match) {
       unlock_catalog (&catalog);
+      free (catalog.filename);
+      free_catalog (&catalog);
       continue;
     }
@@ -140 +143 @@
       unlock_catalog (&catalog);
     }
+    free_catalog (&catalog);
     free (catalog.filename);
 

trunk/Ohana/src/addstar/src/wcatalog.c

@@ -21 +21 @@
     }
   }
+}
+
+void free_catalog (Catalog *catalog) {
 
   /* free, initialize data structures */
-
   if (catalog[0].Naverage) {
     free (catalog[0].average); 
@@ -42 +44 @@
   gfits_free_header (&catalog[0].header);
 }
-