Changeset 39324 for trunk/Ohana/src/libfits/table/F_set_column.c

Timestamp:

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

Author:

eugene

Message:

trying to catch memory corruption by being extra pedantic

File:

• trunk/Ohana/src/libfits/table/F_set_column.c (modified) (13 diffs)

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);
 }