Changeset 38666

Timestamp:

Aug 9, 2015, 6:43:40 AM (11 years ago)

Author:

eugene

Message:

catch buffer overruns for rice, avoid buffer overruns

Location:

branches/eam_branches/ipp-20150625/Ohana/src/libfits

Files:

• matrix/F_compress_data.c (modified) (1 diff)
• table/F_compress_T.c (modified) (4 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/libfits/matrix/F_compress_data.c

@@ -119 +119 @@
       return (FALSE);
     }
+    if (Nout > *Nzdata) {
+      fprintf (stderr, "buffer overrun! %d out, %d available\n", Nout, *Nzdata);
+      return FALSE;
+    }
     *Nzdata = Nout;
     return TRUE;

branches/eam_branches/ipp-20150625/Ohana/src/libfits/table/F_compress_T.c

@@ -211 +211 @@
 
   // allocate the intermediate storage buffers
-  int Nzdata_alloc = max_width*ztilelen + 100;
+  int Nzdata_alloc = 2*max_width*ztilelen + 100;
   ALLOCATE (raw,   char, max_width*ztilelen);
   ALLOCATE (zdata, char, Nzdata_alloc);
@@ -223 +223 @@
   gettimeofday (&startTimer, (void *) NULL);
 
+  // ohana_memcheck (TRUE);
+
   // compress the data : copy into a tile, compress the tile, then add to the output table
   // each tile -> 1 row of the output table
@@ -243 +245 @@
       }
       
+      // ohana_memcheck (TRUE);
+
       // XXX TIMER 2a
       gettimeofday (&stopTimer, (void *) NULL); 
@@ -260 +264 @@
       }
 
+      // ohana_memcheck (TRUE);
       // optname, optvalue = NULL, Noptions = 0