Changeset 39233 for trunk/Ohana/src/opihi/cmd.data

Timestamp:

Dec 5, 2015, 2:07:56 PM (11 years ago)

Author:

eugene

Message:

test for invalid matrix size in CreateBuffer, CreateBuffer3D

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• densify.c (modified) (1 diff)
• fft2d.c (modified) (1 diff)
• gridify.c (modified) (2 diffs)
• mcreate.c (modified) (1 diff)
• medimage_commands.c (modified) (1 diff)
• mslice.c (modified) (1 diff)
• shift.c (modified) (1 diff)
• squash3d.c (modified) (3 diffs)
• tdhistogram.c (modified) (1 diff)
• vgrid.c (modified) (1 diff)

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

@@ -96 +96 @@
   gfits_free_matrix (&bf[0].matrix);
   gfits_free_header (&bf[0].header);
-  CreateBuffer (bf, Nx, Ny, -32, 0.0, 1.0);
+  if (!CreateBuffer (bf, Nx, Ny, -32, 0.0, 1.0)) return FALSE;
   strcpy (bf[0].file, "(empty)");
   

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

@@ -58 +58 @@
   
   /* fix up output headers (real) & allocate data buffer */
-  CreateBuffer (Ore, Nx, Ny, -32, 0.0, 1.0);
-  CreateBuffer (Oim, Nx, Ny, -32, 0.0, 1.0);
+  if (!CreateBuffer (Ore, Nx, Ny, -32, 0.0, 1.0)) return FALSE;
+  if (!CreateBuffer (Oim, Nx, Ny, -32, 0.0, 1.0)) return FALSE;
 
   gfits_copy_header (&Ire[0].header, &Ore[0].header);

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

@@ -85 +85 @@
     gfits_free_matrix (&bf[0].matrix);
     gfits_free_header (&bf[0].header);
-    CreateBuffer (bf, Nx, Ny, -32, 0.0, 1.0);
+    if (!CreateBuffer (bf, Nx, Ny, -32, 0.0, 1.0)) return FALSE;
     strcpy (bf[0].file, "(empty)");
   }
@@ -111 +111 @@
     gfits_free_matrix (&ct[0].matrix);
     gfits_free_header (&ct[0].header);
-    CreateBuffer (ct, Nx, Ny, -32, 0.0, 1.0);
+    if (!CreateBuffer (ct, Nx, Ny, -32, 0.0, 1.0)) return FALSE;
     strcpy (ct[0].file, "(empty)");
 

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

@@ -27 +27 @@
 
   if (Nz) {
-    CreateBuffer3D (buf, Nx, Ny, Nz, -32, 1.0, 0.0);
+    if (!CreateBuffer3D (buf, Nx, Ny, Nz, -32, 1.0, 0.0)) return FALSE;
   } else {
-    CreateBuffer (buf, Nx, Ny, -32, 1.0, 0.0);
+    if (!CreateBuffer (buf, Nx, Ny, -32, 1.0, 0.0)) return FALSE;
   }
   return (TRUE);

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

@@ -82 +82 @@
   gfits_free_matrix (&output->matrix);
   gfits_free_header (&output->header);
-  CreateBuffer (output, Nx, Ny, -32, 0.0, 1.0);
+  if (!CreateBuffer (output, Nx, Ny, -32, 0.0, 1.0)) return FALSE;
 
   float *outvalue = (float *) output->matrix.buffer;

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

@@ -35 +35 @@
   gfits_free_matrix (&out[0].matrix);
   gfits_free_header (&out[0].header);
-  CreateBuffer (out, Nx, Ny, -32, 1.0, 0.0);
+  if (!CreateBuffer (out, Nx, Ny, -32, 1.0, 0.0)) return FALSE;
 
   float *inF  = (float *) in[0].matrix.buffer + plane*Nx*Ny;

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

@@ -48 +48 @@
   gfits_free_matrix (&out[0].matrix);
   gfits_free_header (&out[0].header);
-  CreateBuffer (out, nx, ny, -32, 0.0, 1.0);
+  if (!CreateBuffer (out, nx, ny, -32, 0.0, 1.0)) return FALSE;
 
   DXin = (dx < 0) ? -dx : 0;

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

@@ -46 +46 @@
         int oNx = iNz;
         int oNy = iNy;
-        CreateBuffer (tgt, oNx, oNy, -32, 0.0, 1.0);
+        if (!CreateBuffer (tgt, oNx, oNy, -32, 0.0, 1.0)) return FALSE;
         float *oBuf  = (float *) tgt[0].matrix.buffer;
 
@@ -70 +70 @@
         int oNx = iNx;
         int oNy = iNz;
-        CreateBuffer (tgt, oNx, oNy, -32, 0.0, 1.0);
+        if (!CreateBuffer (tgt, oNx, oNy, -32, 0.0, 1.0)) return FALSE;
         float *oBuf  = (float *) tgt[0].matrix.buffer;
 
@@ -94 +94 @@
         int oNx = iNx;
         int oNy = iNy;
-        CreateBuffer (tgt, oNx, oNy, -32, 0.0, 1.0);
+        if (!CreateBuffer (tgt, oNx, oNy, -32, 0.0, 1.0)) return FALSE;
         float *oBuf  = (float *) tgt[0].matrix.buffer;
 

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

@@ -140 +140 @@
     gfits_free_matrix (&bf[0].matrix);
     gfits_free_header (&bf[0].header);
-    CreateBuffer3D (bf, Nx, Ny, Nz, -32, 0.0, 1.0);
+    if (!CreateBuffer3D (bf, Nx, Ny, Nz, -32, 0.0, 1.0)) return FALSE;
     strcpy (bf[0].file, "(empty)");
 

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

@@ -43 +43 @@
   gfits_free_matrix (&bf[0].matrix);
   gfits_free_header (&bf[0].header);
-  CreateBuffer (bf, Nx, Ny, -32, 0.0, 1.0);
+  if (!CreateBuffer (bf, Nx, Ny, -32, 0.0, 1.0)) return FALSE;
   strcpy (bf[0].file, "(empty)");