Changeset 17903 for trunk/Ohana

Timestamp:

Jun 4, 2008, 1:55:22 PM (18 years ago)

Author:

eugene

Message:

add header.buffer free to gfits_free_header; avoid double free of buffer

Location:

trunk/Ohana/src

Files:

• libfits/header/F_copy_H.c (modified) (1 diff)
• libfits/matrix/F_copy_M.c (modified) (1 diff)
• libfits/matrix/F_create_M.c (modified) (1 diff)
• opihi/cmd.data/spline_construct.c (modified) (1 diff)
• opihi/lib.shell/BufferOps.c (modified) (1 diff)

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

@@ -23 +23 @@
   out[0].bscale = in[0].bscale;
 
+  if (out[0].buffer != NULL) free (out[0].buffer);
   ALLOCATE (out[0].buffer, char, out[0].size);
   

trunk/Ohana/src/libfits/matrix/F_copy_M.c

@@ -16 +16 @@
     matrix2[0].Naxis[i] = matrix1[0].Naxis[i];
 
+  if (matrix2[0].buffer != NULL) free (matrix2[0].buffer);
   ALLOCATE (matrix2[0].buffer, char, matrix2[0].size);
   

trunk/Ohana/src/libfits/matrix/F_create_M.c

@@ -27 +27 @@
 }
 
+// XXX free buffer if non-null: need to double check for existing frees

trunk/Ohana/src/opihi/cmd.data/spline_construct.c

@@ -16 +16 @@
   if ((out = SelectBuffer (argv[2], ANYBUFFER, TRUE)) == NULL) return (FALSE);
 
+  // XXX move this to gfits_create_matrix
   free (out[0].matrix.buffer);
-  free (out[0].header.buffer);
   if ((in[0].file[0] != '*') && (in[0].file[0] != '(')) {
     sprintf (out[0].file, "*%s", in[0].file);

trunk/Ohana/src/opihi/lib.shell/BufferOps.c

@@ -122 +122 @@
 
 int CopyBuffer (Buffer *out, Buffer *in) {
-  free (out[0].matrix.buffer);
-  free (out[0].header.buffer);
   out[0].bitpix = in[0].bitpix;
   out[0].unsign = in[0].unsign;