Changeset 40113 for branches/eam_branches/ohana.20170809/src/libfits/table/F_set_column.c

Timestamp:

Aug 9, 2017, 12:47:22 PM (9 years ago)

Author:

eugene

Message:

mostly harmless changes to track down dvopsps segfaults: watch out for Bzero,Bscale in F_set_column.c

File:

• branches/eam_branches/ohana.20170809/src/libfits/table/F_set_column.c (modified) (9 diffs)

branches/eam_branches/ohana.20170809/src/libfits/table/F_set_column.c

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
-# define OHANA_MEMCHECK 0
-# define CHECK_MEMBLOCKS 0
+# define OHANA_MEMCHECK 1
+# define CHECK_MEMBLOCKS 1
 
 # define SWAP_NONE 
@@ -33 +33 @@
   int Nval, Nbytes, Nstart, Nv, Nb;
   char tlabel[256], field[256], format[256], type[64], tmpline[64];
-  char *Pin, *Pout, *array;
+  char *Pin, *Pout;
   double Bscale, Bzero;
 
@@ -53 +53 @@
 # endif
 
+  // fprintf (stderr, "Pin: 0x%08lx, Pout: 0x%08lx, array: 0x%08lx\n", (long int) &Pin, (long int) &Pout, (long int) &array);
+
   if (label == (char *) NULL) return (FALSE);
   if (label[0] == 0) return (FALSE);
@@ -67 +69 @@
 
   /* interpret format */
+# if (0)
   snprintf (field, 256, "TSCAL%d", N);
   if (!gfits_scan (header, field, "%lf", 1, &Bscale)) {
@@ -75 +78 @@
     Bzero = 0.0;
   }
+# else
+    Bscale = 1.0;
+    Bzero = 0.0;
+# endif  
+
   snprintf (field, 256, "TFORM%d", N);
   if (!gfits_scan (header, field, "%s", 1, format)) return FALSE;
@@ -107 +115 @@
   /* make duplicate of data with correct type
      byte swap and Bzero/Bscale */
-  ALLOCATE (array, char, Nbytes*Nval*Nrow);
+  ALLOCATE_PTR (array, char, Nbytes*Nval*Nrow);
   if (CHECK_MEMBLOCKS) {
     OhanaMemblock *ref = (OhanaMemblock *) array - 1;
-    fprintf (stderr, "ref: 0x%08lx, array: 0x%08lx, size: %zd, (%s@%d : %s), freed: %1d, Nalloc: %d\n", (long int) ref, (long int) array, ref->size, ref->file, ref->line, ref->func, ref->freed, ref->Nalloc);
+    // fprintf (stderr, "ref: 0x%08lx, array: 0x%08lx, size: %zd, (%s@%d : %s), freed: %1d, Nalloc: %d\n", (long int) ref, (long int) array, ref->size, ref->file, ref->line, ref->func, ref->freed, ref->Nalloc);
     if (!ref->nextBlock && !ref->prevBlock) abort();
+    if (!ref->size) abort();
   }
 
@@ -121 +130 @@
   if (CHECK_MEMBLOCKS) {
     OhanaMemblock *ref = (OhanaMemblock *) array - 1;
-    fprintf (stderr, "ref: 0x%08lx, array: 0x%08lx, size: %zd, (%s@%d : %s), freed: %1d, Nalloc: %d\n", (long int) ref, (long int) array, ref->size, ref->file, ref->line, ref->func, ref->freed, ref->Nalloc);
+    // fprintf (stderr, "ref: 0x%08lx, array: 0x%08lx, size: %zd, (%s@%d : %s), freed: %1d, Nalloc: %d\n", (long int) ref, (long int) array, ref->size, ref->file, ref->line, ref->func, ref->freed, ref->Nalloc);
     if (!ref->nextBlock && !ref->prevBlock) abort();
   }
@@ -213 +222 @@
   if (CHECK_MEMBLOCKS) {
     OhanaMemblock *ref = (OhanaMemblock *) array - 1;
-    fprintf (stderr, "ref: 0x%08lx, array: 0x%08lx, size: %zd, (%s@%d : %s), freed: %1d, Nalloc: %d\n", (long int) ref, (long int) array, ref->size, ref->file, ref->line, ref->func, ref->freed, ref->Nalloc);
+    // fprintf (stderr, "ref: 0x%08lx, array: 0x%08lx, size: %zd, (%s@%d : %s), freed: %1d, Nalloc: %d\n", (long int) ref, (long int) array, ref->size, ref->file, ref->line, ref->func, ref->freed, ref->Nalloc);
     if (!ref->nextBlock && !ref->prevBlock) abort();
   }
@@ -242 +251 @@
   if (CHECK_MEMBLOCKS) {
     OhanaMemblock *ref = (OhanaMemblock *) array - 1;
-    fprintf (stderr, "ref: 0x%08lx, array: 0x%08lx, size: %zd, (%s@%d : %s), freed: %1d, Nalloc: %d\n", (long int) ref, (long int) array, ref->size, ref->file, ref->line, ref->func, ref->freed, ref->Nalloc);
+    // fprintf (stderr, "ref: 0x%08lx, array: 0x%08lx, size: %zd, (%s@%d : %s), freed: %1d, Nalloc: %d\n", (long int) ref, (long int) array, ref->size, ref->file, ref->line, ref->func, ref->freed, ref->Nalloc);
     if (!ref->nextBlock && !ref->prevBlock) abort();
   }