Changeset 39394 for trunk

Timestamp:

Feb 26, 2016, 6:19:43 AM (10 years ago)

Author:

eugene

Message:

trying to catch some (possible) stack and heap overflow errors: adding padding to allocated config regions

Location:

trunk/Ohana/src/libfits

Files:

• header/F_read_H.c (modified) (1 diff)
• include/gfitsio.h (modified) (1 diff)
• table/F_set_column.c (modified) (6 diffs)
• table/F_table_format.c (modified) (1 diff)
• table/F_table_row.c (modified) (1 diff)

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

@@ -29 +29 @@
   header[0].datasize = 0;
   done = FALSE;
-  ALLOCATE (header[0].buffer, char, 1);
+  ALLOCATE (header[0].buffer, char, FT_RECORD_SIZE);
 
   for (i = 0; !done; i++) {

trunk/Ohana/src/libfits/include/gfitsio.h

@@ -286 +286 @@
 int gfits_dump_cmp_table (FTable *table, char *message);
 
+void myMemset (char *ptr, int value, size_t N);
 
 #endif /* FITSIO */

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

@@ -2 +2 @@
 # include <gfitsio.h>
 # define OHANA_MEMCHECK 0
+# define CHECK_MEMBLOCKS 0
 
 # define SWAP_NONE 
@@ -45 +46 @@
 # endif
 
+  memset (tlabel,  0, 256);
+  memset (field,   0, 256);
+  memset (format,  0, 256);
+  memset (type,    0, 64);
+  memset (tmpline, 0, 64);
+
   if (label == (char *) NULL) return (FALSE);
   if (label[0] == 0) return (FALSE);
@@ -95 +102 @@
   }
 
+  // ohana_memcheck (TRUE);
+
   /* make duplicate of data with correct type
      byte swap and Bzero/Bscale */
   ALLOCATE (array, char, Nbytes*Nval*Nrow);
+  if (CHECK_MEMBLOCKS) {
+    OhanaMemblock *ref = (OhanaMemblock *) array - 1;
+    fprintf (stderr, "ref: "OFF_T_FMT", array: "OFF_T_FMT"\n", (off_t) ref, (off_t) array);
+    if (!ref->nextBlock && !ref->prevBlock) abort();
+  }
+
   Pin = data;
   Pout = array;
+
+  // ohana_memcheck (TRUE);
+
+  if (CHECK_MEMBLOCKS) {
+    OhanaMemblock *ref = (OhanaMemblock *) array - 1;
+    fprintf (stderr, "ref: "OFF_T_FMT", array: "OFF_T_FMT"\n", (off_t) ref, (off_t) array);
+    if (!ref->nextBlock && !ref->prevBlock) abort();
+  }
 
   // does it makes sense to scale 'char' data?
@@ -187 +210 @@
   }
 
+  if (CHECK_MEMBLOCKS) {
+    OhanaMemblock *ref = (OhanaMemblock *) array - 1;
+    fprintf (stderr, "ref: "OFF_T_FMT", array: "OFF_T_FMT"\n", (off_t) ref, (off_t) array);
+    if (!ref->nextBlock && !ref->prevBlock) abort();
+  }
+
   /* check array space */
   if (Nx*Ny < Nx*(Nrow - 1) + Nstart + Nval*Nbytes) {
@@ -193 +222 @@
   }
 
+  // ohana_memcheck (TRUE);
   /* insert bytes from array into appropriate section of buffer */
   Pout = table[0].buffer + Nstart;
@@ -206 +236 @@
   myAssert (   type[63]  == 0x7f, "oops");
   myAssert (tmpline[63]  == 0x7f, "oops");
-
- ohana_memcheck (TRUE);
-# endif
+# endif
+  // ohana_memcheck (TRUE);
+
+  if (CHECK_MEMBLOCKS) {
+    OhanaMemblock *ref = (OhanaMemblock *) array - 1;
+    fprintf (stderr, "ref: "OFF_T_FMT", array: "OFF_T_FMT"\n", (off_t) ref, (off_t) array);
+    if (!ref->nextBlock && !ref->prevBlock) abort();
+  }
 
   free (array);

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

@@ -115 +115 @@
   // XXXX : check usage:
   myAbort ("need to check length");
-  sprintf (format, "%%-%s%c", Size, Type);
+  // sprintf (format, "%%-%s%c", Size, Type);
 
   return (TRUE);

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

@@ -31 +31 @@
   
   memcpy (&table[0].buffer[Nstart], data, Nbytes*Nrow);
-  memset (&table[0].buffer[Nx*Ny], ' ', nbytes - Nx*Ny);
+  myMemset (&table[0].buffer[Nx*Ny], ' ', nbytes - Nx*Ny);
   return (TRUE);
 }