fix memory leaks; bug 21056

[pspp-builds.git] / src / language / stats / regression.q

diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q
index c6fddb90df5e585dc053e8cc3b37205be2a6f6a0..d923a35b00770ed3e09c04f9cc5cffcf8834c98b 100644 (file)
--- a/src/language/stats/regression.q
+++ b/src/language/stats/regression.q
@@ -92,9 +92,6 @@ struct moments_var
   const struct variable *v;
 };
 
-/* Linear regression models. */
-static pspp_linreg_cache **models = NULL;
-
 /*
   Transformations for saving predicted values
   and residuals, etc.
@@ -122,7 +119,7 @@ static size_t n_variables;
 static struct file_handle *model_file;
 
 static bool run_regression (struct casereader *, struct cmd_regression *,
-                           struct dataset *);
+                           struct dataset *, pspp_linreg_cache **);
 
 /*
    STATISTICS subcommand output functions.
@@ -948,6 +945,7 @@ cmd_regression (struct lexer *lexer, struct dataset *ds)
 {
   struct casegrouper *grouper;
   struct casereader *group;
+  pspp_linreg_cache **models;
   bool ok;
   size_t i;
 
@@ -963,7 +961,7 @@ cmd_regression (struct lexer *lexer, struct dataset *ds)
   /* Data pass. */
   grouper = casegrouper_create_splits (proc_open (ds), dataset_dict (ds));
   while (casegrouper_get_next_group (grouper, &group))
-    run_regression (group, &cmd, ds);
+    run_regression (group, &cmd, ds, models);
   ok = casegrouper_destroy (grouper);
   ok = proc_commit (ds) && ok;
 
@@ -1028,7 +1026,9 @@ identify_indep_vars (const struct variable **indep_vars,
        as the dependent variable. Print a warning and continue.
        */
       msg (SE,
-          gettext ("The dependent variable is equal to the independent variable. The least sequares line is therefore Y=X. Standard errors and related statistics may be meaningless."));
+          gettext ("The dependent variable is equal to the independent variable." 
+                   "The least squares line is therefore Y=X." 
+                   "Standard errors and related statistics may be meaningless."));
       n_indep_vars = 1;
       indep_vars[0] = v_variables[0];
     }
@@ -1120,7 +1120,7 @@ compute_moments (pspp_linreg_cache * c, struct moments_var *mom,
 
 static bool
 run_regression (struct casereader *input, struct cmd_regression *cmd,
-               struct dataset *ds)
+               struct dataset *ds, pspp_linreg_cache **models)
 {
   size_t i;
   int n_indep = 0;
@@ -1136,7 +1136,10 @@ run_regression (struct casereader *input, struct cmd_regression *cmd,
   assert (models != NULL);
 
   if (!casereader_peek (input, 0, &c))
-    return true;
+    {
+      casereader_destroy (input);
+      return true;
+    }
   output_split_file_values (ds, &c);
   case_destroy (&c);
 
@@ -1196,8 +1199,6 @@ run_regression (struct casereader *input, struct cmd_regression *cmd,
              lopts.get_indep_mean_std[i] = 1;
            }
          models[k] = pspp_linreg_cache_alloc (X->m->size1, X->m->size2);
-         models[k]->indep_means = gsl_vector_alloc (X->m->size2);
-         models[k]->indep_std = gsl_vector_alloc (X->m->size2);
          models[k]->depvar = dep_var;
          /*
             For large data sets, use QR decomposition.
@@ -1253,6 +1254,11 @@ run_regression (struct casereader *input, struct cmd_regression *cmd,
        }
       casereader_destroy (reader);
     }
+  for (i = 0; i < n_variables; i++)
+    {
+      moments1_destroy ((mom + i)->m);
+    }
+  free (mom);
   free (indep_vars);
   free (lopts.get_indep_mean_std);
   casereader_destroy (input);