X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fmeans.c;h=888a6a75836707f71564816ab6a15da2b8db8835;hb=22d6d7619202db365c2f0b5b12555e1f2e5e167c;hp=f5e03c16f1d11de2110132ecae7a2d2928463455;hpb=4c9e2993ec6dba97db0068863d7d3bda7970094a;p=pspp

diff --git a/src/language/stats/means.c b/src/language/stats/means.c
index f5e03c16f1..888a6a7583 100644
--- a/src/language/stats/means.c
+++ b/src/language/stats/means.c
@@ -827,6 +827,22 @@ struct per_cat_data
   bool warn;
 };
 
+
+static void 
+destroy_n (const void *aux1 UNUSED, void *aux2, void *user_data)
+{
+  struct mtable *table = aux2;
+  int v;
+  struct per_cat_data *per_cat_data = user_data;
+  struct per_var_data *pvd = per_cat_data->pvd;
+
+  for (v = 0; v < table->n_dep_vars; ++v)
+    {
+      struct per_var_data *pp = &pvd[v];
+      moments1_destroy (pp->mom);
+    }
+}
+
 static void *
 create_n (const void *aux1, void *aux2)
 {
@@ -938,7 +954,8 @@ run_means (struct means *cmd, struct casereader *input,
   struct payload payload;
   payload.create = create_n;
   payload.update = update_n;
-  payload.destroy = calculate_n;
+  payload.calculate = calculate_n;
+  payload.destroy = destroy_n;
   
   for (t = 0; t < cmd->n_tables; ++t)
   {
@@ -950,7 +967,7 @@ run_means (struct means *cmd, struct casereader *input,
     categoricals_set_payload (table->cats, &payload, cmd, table);
   }
 
-  for (reader = casereader_clone (input);
+  for (reader = input;
        (c = casereader_read (reader)) != NULL; case_unref (c))
     {
       for (t = 0; t < cmd->n_tables; ++t)