Changeset 39340

Timestamp:

Feb 10, 2016, 2:45:32 PM (10 years ago)

Author:

eugene

Message:

zero bytes at end of table data region; plug memleak

Location:

trunk/Ohana/src

Files:

• dvomerge/src/dvomergeUpdate_catalogs.c (modified) (1 diff)
• dvomerge/src/dvomerge_client.c (modified) (1 diff)
• libfits/table/F_compress_T.c (modified) (1 diff)
• libfits/table/F_table_varlength.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -247 +247 @@
   dvo_report_image_IDs (IDmap);
 
+  FreeHostTable(table_input);
+
   return TRUE;
 }

trunk/Ohana/src/dvomerge/src/dvomerge_client.c

@@ -110 +110 @@
 
   dvomerge_client_args_free ();
-  // ohana_memcheck (TRUE);
+  ohana_memcheck (TRUE);
   // ohana_memdump (TRUE);
 

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

@@ -81 +81 @@
     } else {
       Ntile = srcheader->Naxis[1] / ztilelen;
-    ztilelast = ztilelen;
+      ztilelast = ztilelen;
     }
   }

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

@@ -163 +163 @@
   memcpy (heap_ptr, data, Ndata);
 
+  // zero out the extra bytes
+  off_t Nextra = Nbytes - (heap_offset + Ndata);
+  memset (&heap_ptr[Ndata], 0, Nextra);
+
   // *** now we add the data description to the table ***