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

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.astro

Files:

• cdensify.c (modified) (1 diff)
• cdhistogram.c (modified) (1 diff)
• fiximage.c (modified) (1 diff)
• getcoords.c (modified) (1 diff)
• imfit.c (modified) (1 diff)
• shimage.c (modified) (1 diff)
• vshimage.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.astro/cdensify.c

@@ -84 +84 @@
   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)");
   PutCoords (&newcoords, &bf[0].header);

trunk/Ohana/src/opihi/cmd.astro/cdhistogram.c

@@ -101 +101 @@
   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)");
   PutCoords (&newcoords, &bf[0].header);

trunk/Ohana/src/opihi/cmd.astro/fiximage.c

@@ -26 +26 @@
   gfits_free_matrix (&mask[0].matrix);
   gfits_free_header (&mask[0].header);
-  CreateBuffer (mask, Nx, Ny, -32, 0.0, 1.0);
+  if (!CreateBuffer (mask, Nx, Ny, -32, 0.0, 1.0)) return FALSE;
   strcpy (mask[0].file, "(empty)");
   memset (mask[0].matrix.buffer, 0, Nx*Ny*sizeof(float));

trunk/Ohana/src/opihi/cmd.astro/getcoords.c

@@ -73 +73 @@
   gfits_free_matrix (&outC1[0].matrix);
   gfits_free_header (&outC1[0].header);
-  CreateBuffer (outC1, Nx, Ny, -32, 1.0, 0.0);
+  if (!CreateBuffer (outC1, Nx, Ny, -32, 1.0, 0.0)) return FALSE;
 
   gfits_free_matrix (&outC2[0].matrix);
   gfits_free_header (&outC2[0].header);
-  CreateBuffer (outC2, Nx, Ny, -32, 1.0, 0.0);
+  if (!CreateBuffer (outC2, Nx, Ny, -32, 1.0, 0.0)) return FALSE;
 
   float *valC1 = (float *) outC1[0].matrix.buffer;

trunk/Ohana/src/opihi/cmd.astro/imfit.c

@@ -141 +141 @@
 
     strcpy (out[0].file, "(empty)");
-    CreateBuffer (out, 2*nx, 2*ny, -32, 0.0, 1.0);
+    if (!CreateBuffer (out, 2*nx, 2*ny, -32, 0.0, 1.0)) return FALSE;
 
     /* four panels: 1) raw image. 2) fit  3) raw - fit   4) ?? */

trunk/Ohana/src/opihi/cmd.astro/shimage.c

@@ -30 +30 @@
   int Ny = src[0].header.Naxis[1];
 
-  gfits_free_matrix (&FrIm[0].matrix); gfits_free_header (&FrIm[0].header); CreateBuffer (FrIm, Nx, Ny, -32, 1.0, 0.0);
-  gfits_free_matrix (&FiIm[0].matrix); gfits_free_header (&FiIm[0].header); CreateBuffer (FiIm, Nx, Ny, -32, 1.0, 0.0);
+  gfits_free_matrix (&FrIm[0].matrix); gfits_free_header (&FrIm[0].header); if (!CreateBuffer (FrIm, Nx, Ny, -32, 1.0, 0.0)) return FALSE;
+  gfits_free_matrix (&FiIm[0].matrix); gfits_free_header (&FiIm[0].header); if (!CreateBuffer (FiIm, Nx, Ny, -32, 1.0, 0.0)) return FALSE;
 
   // l=0 allocates space for a single value

trunk/Ohana/src/opihi/cmd.astro/vshimage.c

@@ -32 +32 @@
   int Ny = src[0].header.Naxis[1];
 
-  gfits_free_matrix (&Rbim[0].matrix); gfits_free_header (&Rbim[0].header); CreateBuffer (Rbim, Nx, Ny, -32, 1.0, 0.0);
-  gfits_free_matrix (&Reim[0].matrix); gfits_free_header (&Reim[0].header); CreateBuffer (Reim, Nx, Ny, -32, 1.0, 0.0);
-  gfits_free_matrix (&Dbim[0].matrix); gfits_free_header (&Dbim[0].header); CreateBuffer (Dbim, Nx, Ny, -32, 1.0, 0.0);
-  gfits_free_matrix (&Deim[0].matrix); gfits_free_header (&Deim[0].header); CreateBuffer (Deim, Nx, Ny, -32, 1.0, 0.0);
+  gfits_free_matrix (&Rbim[0].matrix); gfits_free_header (&Rbim[0].header); if (!CreateBuffer (Rbim, Nx, Ny, -32, 1.0, 0.0)) return FALSE;
+  gfits_free_matrix (&Reim[0].matrix); gfits_free_header (&Reim[0].header); if (!CreateBuffer (Reim, Nx, Ny, -32, 1.0, 0.0)) return FALSE;
+  gfits_free_matrix (&Dbim[0].matrix); gfits_free_header (&Dbim[0].header); if (!CreateBuffer (Dbim, Nx, Ny, -32, 1.0, 0.0)) return FALSE;
+  gfits_free_matrix (&Deim[0].matrix); gfits_free_header (&Deim[0].header); if (!CreateBuffer (Deim, Nx, Ny, -32, 1.0, 0.0)) return FALSE;
 
   // l=0 allocates space for a single value