Changeset 39324 for trunk/Ohana/src/libfits

Timestamp:

Jan 27, 2016, 11:18:36 AM (10 years ago)

Author:

eugene

Message:

trying to catch memory corruption by being extra pedantic

Location:

trunk/Ohana/src/libfits

Files:

• header/F_scan.c (modified) (10 diffs)
• table/F_set_column.c (modified) (13 diffs)
• table/F_uncompress_T.c (modified) (2 diffs)

trunk/Ohana/src/libfits/header/F_scan.c

@@ -44 +44 @@
   if (p[8] != '=') return (FALSE);
 
+  s = gfits_keyword_start (p); /* points at first char (not ') */
+  q = gfits_keyword_end (p); /* points at following space or ' */
+
+  // these are invalid conditions:
+  if (s - p > 80) return FALSE;
+  if (q - p > 80) return FALSE;
+
   /* extract data into char array (exclude containing ' chars) */
+  Nchar = MIN (80, MAX (0, (q - s)));
+  bzero (tmp, 81);
+  memcpy (tmp, s, Nchar);
+
+  // for string types, copy the data to the target pointer
   if (!strcmp (mode, "%s")) {
-    s = gfits_keyword_start (p); /* points at first char (not ') */
-    q = gfits_keyword_end (p); /* points at following space or ' */
-
-    Nchar = MAX (0, (q - s));
-    bzero (tmp, 81);
-    memcpy (tmp, s, Nchar);
     stripwhite (tmp);
     strcpy (va_arg (argp, char *), tmp);
@@ -59 +65 @@
   /* remaining options are numerical data */
   /* need to interpret 1.0d5 as 1.0e5 */
-  s = gfits_keyword_start (p); /* points at first char (not ') */
-  q = gfits_keyword_end (p); /* points at following space or ' */
 
   if (!strcmp (mode, "%f") || !strcmp (mode, "%lf")) {
-    fvalue = strtod (s, &q);
-    if ((*q == 'd') || (*q == 'D')) 
-      fvalue *= pow (10.0, atof (q + 1));
+    fvalue = strtod (tmp, &q);
+    if ((*q == 'd') || (*q == 'D')) fvalue *= pow (10.0, atof (q + 1));
 
     if (!strcmp (mode, "%f"))   { *va_arg (argp, float *)  = fvalue; return (TRUE); }
@@ -71 +74 @@
   }
 
-  value = strtoll (s, &q, 0);
+  value = strtoll (tmp, &q, 0);
   if ((*q == 'd') || (*q == 'D')) value *= pow (10.0, atof (q + 1));
 
@@ -96 +99 @@
 int gfits_vscan_alt (Header *header, char *field, char *mode, int N, va_list argp) {
 
-  char *p, *q, *s, tmp[81];
+  char *p, *q, *s, tmp[128];
   int Nchar, status;
 
@@ -117 +120 @@
   /* comment from data line */
   if (!strcmp (mode, "%C")) {
-    q = gfits_keyword_end (p) + 3;
+    q = gfits_keyword_end (p);
+    if (!q) return (FALSE);
+    q += 3;
     q = MIN (p + 80, q);
     bzero (tmp, 81);
-    Nchar = MIN (80, p + 80 - q);
+    Nchar = MAX (0, MIN (80, p + 80 - q));
     memcpy (tmp, q, Nchar);
     stripwhite (tmp);
@@ -147 +152 @@
 int gfits_vscan_hierarch (Header *header, char *field, char *mode, int N, va_list argp) {
 
-  char *p, *q, *s, tmp[81];
+  char *p, *q, *s, tmp[128];
   int Nchar, Nfield;
   long long value;
@@ -172 +177 @@
     q = MIN (p + HIERARCH_LENGTH, q);
     bzero (tmp, 81);
-    Nchar = MIN (HIERARCH_LENGTH, p + HIERARCH_LENGTH - q);
+    Nchar = MAX (0, MIN (HIERARCH_LENGTH, p + HIERARCH_LENGTH - q));
     memcpy (tmp, q, Nchar);
     stripwhite (tmp);
@@ -179 +184 @@
   }
 
-  /* extract data into char array (exclude containing ' chars) */
-  if (!strcmp (mode, "%s")) {
-    s = gfits_hierarch_keyword_start (p, field); /* points at first char (not ') */
-    q = gfits_hierarch_keyword_end (p, field); /* points at following space or ' */
-
-    Nchar = MIN (HIERARCH_LENGTH, MAX (0, (q - s)));
-    bzero (tmp, 81);
-    memcpy (tmp, s, Nchar);
-    stripwhite (tmp);
-    strcpy (va_arg (argp, char *), tmp);
-    return (TRUE);
-  }
-  
+  s = gfits_hierarch_keyword_start (p, field); /* points at first char (not ') */
+  q = gfits_hierarch_keyword_end (p, field); /* points at following space or ' */
+
+  // these are invalid conditions:
+  if (s - p > 80) return FALSE;
+  if (q - p > 80) return FALSE;
+
   /* boolean data, requires int target */
   if (!strcmp (mode, "%t")) {
-    s = gfits_hierarch_keyword_start (p, field);
     if (*s == 'T') {
       *va_arg (argp, int *) = TRUE;
@@ -205 +203 @@
   }
 
+  /* extract data into char array (exclude containing ' chars) */
+  Nchar = MIN (HIERARCH_LENGTH, MAX (0, (q - s)));
+  bzero (tmp, 81);
+  memcpy (tmp, s, Nchar);
+
+  // for string types, copy the data to the target pointer
+  if (!strcmp (mode, "%s")) {
+    stripwhite (tmp);
+    strcpy (va_arg (argp, char *), tmp);
+    return (TRUE);
+  }
+  
   /* remaining options are numerical data */
   /* need to interpret 1.0d5 as 1.0e5 */
-  s = gfits_hierarch_keyword_start (p, field); /* points at first char (not ') */
-  q = gfits_hierarch_keyword_end (p, field); /* points at following space or ' */
 
   if (!strcmp (mode, "%f") || !strcmp (mode, "%lf")) {
-    fvalue = strtod (s, &q);
-    if ((*q == 'd') || (*q == 'D')) 
-      fvalue *= pow (10.0, atof (q + 1));
+    fvalue = strtod (tmp, &q);
+    if ((*q == 'd') || (*q == 'D')) fvalue *= pow (10.0, atof (q + 1));
 
     if (!strcmp (mode, "%f"))   { *va_arg (argp, float *)  = fvalue; return (TRUE); }
@@ -219 +226 @@
   }
 
-  value = strtoll (s, &q, 0);
+  value = strtoll (tmp, &q, 0);
   if ((*q == 'd') || (*q == 'D')) value *= pow (10.0, atof (q + 1));
 

trunk/Ohana/src/libfits/table/F_set_column.c

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
+# define OHANA_MEMCHECK 0
 
 # define SWAP_NONE 
@@ -34 +35 @@
   double Bscale, Bzero;
 
+# if (OHANA_MEMCHECK)
+  memset (tlabel,  0x7f, 256);
+  memset (field,   0x7f, 256);
+  memset (format,  0x7f, 256);
+  memset (type,    0x7f, 64);
+  memset (tmpline, 0x7f, 64);
+
+  ohana_memcheck_block (data);
+# endif
+
   if (label == (char *) NULL) return (FALSE);
   if (label[0] == 0) return (FALSE);
@@ -42 +53 @@
   for (i = 1; strcasecmp (label, tlabel) && (i < Nfields + 1); i++) {
     snprintf (field, 256, "TTYPE%d", i);
-    gfits_scan (header, field, "%s", 1, tlabel);
+    if (!gfits_scan (header, field, "%s", 1, tlabel)) return FALSE;
   }
   if (strcasecmp (label, tlabel)) return (FALSE);
@@ -57 +68 @@
   }
   snprintf (field, 256, "TFORM%d", N);
-  gfits_scan (header, field, "%s", 1, format);
+  if (!gfits_scan (header, field, "%s", 1, format)) return FALSE;
 
   if (!gfits_bintable_format (format, type, &Nval, &Nbytes)) return (FALSE);
@@ -72 +83 @@
   if (Ny != Nrow) return (FALSE);
 
+  // if we call this function with a null pointer, we are only validating the header and allocating the data array
+  if (!data) return TRUE;
+
   /* scan columns to find insert point */
   Nstart = 0;
   for (i = 1; i < N; i++) {
     snprintf (field, 256, "TFORM%d", i);
-    gfits_scan (header, field, "%s", 1, format);
+    if (!gfits_scan (header, field, "%s", 1, format)) return FALSE;
     gfits_bintable_format (format, tmpline, &Nv, &Nb);
     Nstart += Nv*Nb;
@@ -86 +100 @@
   Pin = data;
   Pout = array;
+
   // does it makes sense to scale 'char' data?
   if (!strcmp (type, "char")) {
@@ -92 +107 @@
     }
   }
+
   if (!strcmp (type, "byte")) {
     for (i = 0; i < Nval*Nrow; i++, Pin+=Nbytes, Pout+=Nbytes) {
@@ -97 +113 @@
     }
   }
+
   if (!strcmp (type, "short")) {
     for (i = 0; i < Nval*Nrow; i++, Pin+=Nbytes, Pout+=Nbytes) {
@@ -105 +122 @@
     }  
   }
+  
   if (!strcmp (type, "int")) {
     for (i = 0; i < Nval*Nrow; i++, Pin+=Nbytes, Pout+=Nbytes) {
@@ -113 +131 @@
     }
   }
+
   if (!strcmp (type, "int64_t")) {
     // XXX 64 bit int operations with Bzero & Bscale are inaccurate even with doubles
@@ -131 +150 @@
     }
   }
+
   if (!strcmp (type, "float")) {
     for (i = 0; i < Nval*Nrow; i++, Pin+=Nbytes, Pout+=Nbytes) {
@@ -139 +159 @@
     }
   }
+
   if (!strcmp (type, "double")) {
     for (i = 0; i < Nval*Nrow; i++, Pin+=Nbytes, Pout+=Nbytes) {
@@ -179 +200 @@
   }
 
+# if (OHANA_MEMCHECK)
+  myAssert ( tlabel[255] == 0x7f, "oops");
+  myAssert (  field[255] == 0x7f, "oops");
+  myAssert ( format[255] == 0x7f, "oops");
+  myAssert (   type[63]  == 0x7f, "oops");
+  myAssert (tmpline[63]  == 0x7f, "oops");
+
+ ohana_memcheck (TRUE);
+# endif
+
   free (array);
+
   return (TRUE);
 }

trunk/Ohana/src/libfits/table/F_uncompress_T.c

@@ -8 +8 @@
 int gfits_distribute_table_gzp2 (FTable *table, TableField *field, char *raw, int row_start, int Nrows);
 
+# define OHANA_MEMCHECK 0
 # define VERBOSE_DUMP 0
 
@@ -164 +165 @@
   gettimeofday (&startTimer, (void *) NULL);
 
-  // this allocates the pointer data array for the full set of tiles (NOT the heap)
-  char *tmpbuffer = NULL;
-  ALLOCATE_ZERO (tmpbuffer, char, max_width*Ny);
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
+
+  // this allocates the pointer data array for the full set of tiles (NOT the heap) by
+  // calling with an empty data array, data values are not actually copied (this is done
+  // below after decompression)
   for (i = 0; i < Nfields; i++) {
-    if (!gfits_set_bintable_column (tgtheader, tgttable, fields[i].ttype, tmpbuffer, Ny)) ESCAPE;
-  }
-  free (tmpbuffer);
+    if (!gfits_set_bintable_column (tgtheader, tgttable, fields[i].ttype, NULL, Ny)) ESCAPE;
+  }
     
+  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
+
   int Ntile = srcheader->Naxis[1];
   int ztilelast;