Changeset 39395

Timestamp:

Feb 26, 2016, 6:20:45 AM (10 years ago)

Author:

eugene

Message:

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

Location:

trunk/Ohana/src/libdvo/src

Files:

• HostTable.c (modified) (2 diffs)
• LoadPhotcodesText.c (modified) (3 diffs)
• RegionHostTable.c (modified) (2 diffs)
• dvo_catalog.c (modified) (1 diff)
• dvo_catalog_split.c (modified) (1 diff)

trunk/Ohana/src/libdvo/src/HostTable.c

@@ -124 +124 @@
 
     // XXXX use this for safety: int status = scan_line_maxlen (f, line, 1024);
-    int status = scan_line (f, line);
+    int status = scan_line_maxlen (f, line, 1024);
     if (status == EOF) break;
 
@@ -702 +702 @@
 int HostTableTestHost (SkyRegion *region, int hostID) {
 
+  myAssert (region, "oops");
+
   // if hostID is not set, then we are not in a remote client 
   if (!hostID) return TRUE;

trunk/Ohana/src/libdvo/src/LoadPhotcodesText.c

@@ -14 +14 @@
   return (value);
 }
+
+# define MAX_LINE_LENGTH 1024
+# define MAX_WORD_LENGTH 64
 
 /* load the text photcode table */
@@ -26 +29 @@
   int code;
   char *c;
-  char line[256], **c1_names, **c2_names, **eq_names;
-  char name[32], type[32], Zero[32], Airmass[32], Offset[32];
-  char C1[32], C2[32], Slope[32], Color[32], Primary[32];
-  char astromErrSys[32], astromErrScale[32], astromErrMagScale[32], photomErrSys[32];
-  char astromPoorMask[32], astromBadMask[32], photomPoorMask[32], photomBadMask[32];
+  char line[MAX_LINE_LENGTH], **c1_names, **c2_names, **eq_names;
+  char name[MAX_WORD_LENGTH], type[MAX_WORD_LENGTH], Zero[MAX_WORD_LENGTH], Airmass[MAX_WORD_LENGTH], Offset[MAX_WORD_LENGTH];
+  char C1[MAX_WORD_LENGTH], C2[MAX_WORD_LENGTH], Slope[MAX_WORD_LENGTH], Color[MAX_WORD_LENGTH], Primary[MAX_WORD_LENGTH];
+  char astromErrSys[MAX_WORD_LENGTH], astromErrScale[MAX_WORD_LENGTH], astromErrMagScale[MAX_WORD_LENGTH], photomErrSys[MAX_WORD_LENGTH];
+  char astromPoorMask[MAX_WORD_LENGTH], astromBadMask[MAX_WORD_LENGTH], photomPoorMask[MAX_WORD_LENGTH], photomBadMask[MAX_WORD_LENGTH];
 
   table = GetPhotcodeTable ();
@@ -59 +62 @@
   ALLOCATE (c2_names, char *,   NPHOTCODE);
 
-  while (scan_line (f, line) != EOF) {
+  while (scan_line_maxlen (f, line, MAX_LINE_LENGTH) != EOF) {
     for (c = line; isspace (*c); c++);
     if (*c == '#') continue;

trunk/Ohana/src/libdvo/src/RegionHostTable.c

@@ -58 +58 @@
 }
 
+# define MAX_LINE_LENGTH 1024
 RegionHostTable *RegionHostTableLoad (char *catdir, char *rootname) {
 
@@ -95 +96 @@
   for (Nline = 0; TRUE; Nline ++) {
     int ID;
-    char tmphost[1024];
-    char line[1024];
-
-    // XXXX use this for safety: int status = scan_line_maxlen (f, line, 1024);
-    int status = scan_line (f, line);
+    char tmphost[MAX_LINE_LENGTH];
+    char line[MAX_LINE_LENGTH];
+
+    int status = scan_line_maxlen (f, line, MAX_LINE_LENGTH);
     if (status == EOF) break;
 

trunk/Ohana/src/libdvo/src/dvo_catalog.c

@@ -999 +999 @@
     catalog[0].measure = NULL;
   }
+  if (catalog[0].measureT) {
+    free (catalog[0].measureT); 
+  }
   if (catalog[0].missing) {
     free (catalog[0].missing); 

trunk/Ohana/src/libdvo/src/dvo_catalog_split.c

@@ -445 +445 @@
   if (!gfits_scan (&catalog[0].header, "NLENSOBJ",  OFF_T_FMT, 1,  &Nlensobj))  Nlensobj  = 0;
   if (!gfits_scan (&catalog[0].header, "NSTARPAR",  OFF_T_FMT, 1,  &Nstarpar))  Nstarpar  = 0;
-  if (!gfits_scan (&catalog[0].header, "NGALPHOT", OFF_T_FMT, 1,  &Ngalphot)) Ngalphot = 0;
+  if (!gfits_scan (&catalog[0].header, "NGALPHOT",  OFF_T_FMT, 1,  &Ngalphot))  Ngalphot  = 0;
 
   /* the OBJID is a counter that uniquely defines an average entry and never changes.  if