Changeset 16428

Timestamp:

Feb 13, 2008, 3:22:13 PM (18 years ago)

Author:

eugene

Message:

fix leaks

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• applyfit.c (modified) (3 diffs)
• applyfit2d.c (modified) (3 diffs)

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

@@ -17 +17 @@
 
   c = get_variable ("Cn");
-  if (c == (char *) NULL) {
+  if (c == NULL) {
     gprint (GP_ERR, "no fit available\n");
     return (FALSE);
   }
   order = atof (c);
+  free (c);
 
   if ((xvec = SelectVector (argv[1], OLDVECTOR, TRUE)) == NULL) return (FALSE);    
@@ -30 +31 @@
     sprintf (name, "C%d", i);
     c = get_variable (name);
-    if (c == (char *) NULL) {
+    if (c == NULL) {
       gprint (GP_ERR, "missing fit term %d\n", i);
       return (FALSE);
     }
     C[i] = atof (c);
+    free (c);
   }
   yvec[0].Nelements = xvec[0].Nelements;
@@ -54 +56 @@
 
 }
-
-
-
-

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

@@ -17 +17 @@
 
   c = get_variable ("Cnn");
-  if (c == (char *) NULL) {
+  if (c == NULL) {
     gprint (GP_ERR, "no fit available\n");
     return (FALSE);
   }
   order = atof (c);
+  free (c);
 
   if ((xvec = SelectVector (argv[1], OLDVECTOR, TRUE)) == NULL) return (FALSE);    
@@ -33 +34 @@
       sprintf (name, "CX%dY%d", i, j);
       c = get_variable (name);
-      if (c == (char *) NULL) {
+      if (c == NULL) {
         gprint (GP_ERR, "missing fit term %d,%d\n", i, j);
+        for (j = 0; j < i; j++) free (C[j]);
+        free (C);
         return (FALSE);
       }
       C[i][j] = atof (c);
+      free (c);
     }
   }
@@ -59 +63 @@
     }
   }
+  for (i = 0; i < order + 1; i++) free (C[i]);
+  free (C);
 
   return (TRUE);
-
 }
 
 
-
-