Changeset 39396 for trunk

Timestamp:

Feb 26, 2016, 6:21:57 AM (10 years ago)

Author:

eugene

Message:

plug memleaks; trying to catch some (possible) stack and heap overflow errors: adding padding to allocated config regions, using scan_line_maxlen

Location:

trunk/Ohana/src/relastro

Files:

• include/relastro.h (modified) (3 diffs)
• src/BrightCatalog.c (modified) (2 diffs)
• src/ConfigInit.c (modified) (4 diffs)
• src/SetSignals.c (modified) (1 diff)
• src/args.c (modified) (1 diff)
• src/load_catalogs.c (modified) (1 diff)
• src/plotstuff.c (modified) (1 diff)
• src/relastro_client.c (modified) (4 diffs)

trunk/Ohana/src/relastro/include/relastro.h

@@ -415 +415 @@
 void SetProtect (int mode);
 int SetSignals (void);
+
+void relastro_client_free ();
 
 GSCRegion    *find_regions        PROTO((Image *image, off_t Nimage, int *Nregions, GSCRegion *fullregion));
@@ -610 +612 @@
 int BrightCatalogSplit (CatalogSplitter *catalogs, BrightCatalog *bcatalog);
 int BrightCatalogSplitFree (CatalogSplitter *catalogs);
+void BrightCatalogFree (BrightCatalog *bcatalog);
 
 PhotCode **ParsePhotcodeList (char *rawlist, int *nphotcodes, int needAve);
@@ -774 +777 @@
 double weight_cauchy (double x);
 double dpsi_cauchy (double x);
+void my_memdump (char *message);

trunk/Ohana/src/relastro/src/BrightCatalog.c

@@ -357 +357 @@
 
     ohana_memcheck (1);
+
+    my_memdump("start of define_bintable");
     gfits_define_bintable_column (&theader, "D", "RA",       "ra",                         "degrees", 1.0, 0.0);
+    my_memdump("after define_bintable RA");
+
     gfits_define_bintable_column (&theader, "D", "DEC",      "dec",                        "degrees", 1.0, 0.0);
+    my_memdump("after define_bintable DEC");
+
     gfits_define_bintable_column (&theader, "E", "MAG_SYS",  "magnitude (sys)",             NULL,    1.0, 0.0);
     gfits_define_bintable_column (&theader, "E", "MAG_CAL",  "magnitude (cal)",             NULL,    1.0, 0.0);
@@ -771 +777 @@
 }
 
+void BrightCatalogFree (BrightCatalog *bcatalog) {
+  if (!bcatalog) return;
+  FREE (bcatalog[0].average);
+  FREE (bcatalog[0].measure);
+  FREE (bcatalog[0].secfilt);
+  FREE (bcatalog);
+  return;
+}
+
 // distribute a bright catalog across separate catalogs
 CatalogSplitter *BrightCatalogSplitInit (int Nsecfilt) {

trunk/Ohana/src/relastro/src/ConfigInit.c

@@ -4 +4 @@
 
   char  *config, *file;
-  char CatdirPhotcodeFile[256];
+  char CatdirPhotcodeFile[DVO_MAX_PATH];
   struct stat filestat;
   int status;
@@ -61 +61 @@
   ScanConfig(config, "WHERE_B",                "%s",  0, WHERE_B);
 
-  sprintf (ImageCat, "%s/Images.dat", CATDIR);
+  snprintf (ImageCat, DVO_MAX_PATH, "%s/Images.dat", CATDIR);
 
   if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) SKY_DEPTH = 2;
@@ -77 +77 @@
 
   /* update master photcode table if not defined */
-  sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
+  snprintf (CatdirPhotcodeFile, DVO_MAX_PATH, "%s/Photcodes.dat", CATDIR);
   if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
     fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
@@ -91 +91 @@
   }
 
+  FreeConfigFile();
   free (config);
   free (file);

trunk/Ohana/src/relastro/src/SetSignals.c

@@ -52 +52 @@
   return (TRUE);
 }
+
+void my_memdump (char *message) {
+
+  fprintf (stderr, "%s\n", message);
+  pid_t myPid = getpid();
+  char line[256];
+  snprintf (line, 256, "cat /proc/%d/maps", myPid);
+  system (line);
+  fprintf (stderr, "-------------------- end ---------------------\n");
+  return;
+}
+
 /*
 

trunk/Ohana/src/relastro/src/args.c

@@ -920 +920 @@
   if (argc != 1) usage_client ();
   return TRUE;
+}
+
+void relastro_client_free () {
+  FREE (PHOTCODE_SKIP_LIST);
+  FREE (PHOTCODE_KEEP_LIST);
+  FREE (PHOTCODE_RESET_LIST);
+  FREE (DCR_RED_COLOR_POS);
+  FREE (DCR_RED_COLOR_NEG);
+  FREE (DCR_BLUE_COLOR_POS);
+  FREE (DCR_BLUE_COLOR_NEG);
+
+  FREE(PHOTCODE_A_LIST);
+  FREE(PHOTCODE_B_LIST);
+  FREE(HIGH_SPEED_DIR);
+  FREE(BCATALOG);
+  FREE (HOSTDIR);
 }
 

trunk/Ohana/src/relastro/src/load_catalogs.c

@@ -92 +92 @@
     }
     Ncat ++;
+
+    char message[1024];
+    snprintf (message, 1024, "loaded catalog: %d", Ncat);
+    my_memdump(message);
   }
 

trunk/Ohana/src/relastro/src/plotstuff.c

@@ -25 +25 @@
   char name[100];
 
-  sprintf (name, "gastro [%d]", N);
+  snprintf (name, 100, "gastro [%d]", N);
   Xgraph[N] = KapaOpen ("kapa", name);
 

trunk/Ohana/src/relastro/src/relastro_client.c

@@ -1 +1 @@
 # include "relastro.h"
+// # include <sys/types.h>
+// # include <unistd.h>
 
 // relastro_client is run on a remote host and is responsible for updating the catalogs
@@ -21 +23 @@
 int main (int argc, char **argv) {
 
+  my_memdump("start of program");
+
   // get configuration info, args, lockfile (set CATDIR, HOST_ID, HOSTDIR, etc) 
   SetSignals ();
@@ -28 +32 @@
   SkyTableSetFilenames (sky, CATDIR, "cpt");
   SkyList *skylist = SkyListByPatch (sky, -1, &UserPatch);
+
+  my_memdump("done config");
 
   switch (RELASTRO_OP) {
@@ -39 +45 @@
         exit (2);
       }
+      my_memdump("loaded catalogs");
+
       BrightCatalog *bcatalog = BrightCatalogMerge (catalog, Ncatalog);
+      my_memdump("merged bcatalog");
+
       if (!BrightCatalogSave (BCATALOG, bcatalog)) {
         fprintf (stderr, "ERROR saving bright catalog from %s\n", CATDIR);
         exit (2);
       }
+
+      SkyTableFree (sky);
+      SkyListFree(skylist);
+      FreePhotcodeTable();
+
+      int i;
+      for (i = 0; i < Ncatalog; i++) {
+        dvo_catalog_free (&catalog[i]);
+      }
+      FREE (catalog);
+      BrightCatalogFree(bcatalog);
+
+      relastro_client_free ();
+      FREE(photcodesKeep);
+      FREE(photcodesSkip);  
+      FREE(photcodesReset); 
+      FREE(photcodesGroupA);
+      FREE(photcodesGroupB);
+
+      ohana_memcheck (TRUE);
+      ohana_memdump (TRUE);
       break;
     }