Free linreg struct if no valid data;

no not attempt to save residuals or predicted values in this case

diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q
index 5b063950753c3c959cded0b4ff15e08240c36ff9..abb3bd353aebea6814d55c7b7c00ab0be926f95a 100644 (file)
--- a/src/language/stats/regression.q
+++ b/src/language/stats/regression.q
@@ -659,8 +659,6 @@ subcommand_save (struct dataset *ds, int save, linreg ** models)
   int n_trns = 0;
   int i;
 
-  assert (models != NULL);
-
   if (save)
     {
       /* Count the number of transformations we will need. */
@@ -954,6 +952,8 @@ run_regression (struct casereader *input, struct cmd_regression *cmd,
        {
          msg (SE,
               gettext ("No valid data found. This command was skipped."));
+         linreg_free (models[k]);
+         models[k] = NULL;
        }
     }
 

diff --git a/src/math/linreg.c b/src/math/linreg.c
index b6d1c16c7c6105629dfa28b448cb46fd873cf7b2..bb4de0c21c57a08faaf46e76022d52485c8f800f 100644 (file)
--- a/src/math/linreg.c
+++ b/src/math/linreg.c
@@ -71,7 +71,7 @@ linreg_alloc (const struct variable *depvar, const struct variable **indep_vars,
 {
   linreg *c;
 
-  c = (linreg *) malloc (sizeof (linreg));
+  c = xmalloc (sizeof (linreg));
   c->depvar = depvar;
   c->indep_vars = indep_vars;
   c->indep_means = gsl_vector_alloc (p);