Changeset 39324 for trunk/Ohana/src/libfits/table/F_uncompress_T.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_uncompress_T.c (modified) (2 diffs)

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;