Fix leak check in oneway command

diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c
index 9d31b4201f20ca2c0d552a110e74c2d2ff69aad9..a30026e8b4c38c283fcc74a7524fdec9d8caed3b 100644 (file)
--- a/src/language/stats/oneway.c
+++ b/src/language/stats/oneway.c
@@ -52,6 +52,7 @@
 /* Workspace variable for each dependent variable */
 struct per_var_ws
 {
+  struct interaction *iact;
   struct categoricals *cat;
   struct covariance *cov;
   struct levene *nl;
@@ -702,15 +703,14 @@ run_oneway (const struct oneway_spec *cmd,
 
   for (v = 0; v < cmd->n_vars; ++v)
     {
-      struct interaction *inter = interaction_create (cmd->indep_var);
-
       struct payload payload;
       payload.create = makeit;
       payload.update = updateit;
       payload.calculate = NULL;
       payload.destroy = killit;
 
-      ws.vws[v].cat = categoricals_create (&inter, 1, cmd->wv,
+      ws.vws[v].iact = interaction_create (cmd->indep_var);
+      ws.vws[v].cat = categoricals_create (&ws.vws[v].iact, 1, cmd->wv,
                                            cmd->exclude, cmd->exclude);
 
       categoricals_set_payload (ws.vws[v].cat, &payload, 
@@ -874,7 +874,9 @@ run_oneway (const struct oneway_spec *cmd,
       covariance_destroy (ws.vws[v].cov);
       levene_destroy (ws.vws[v].nl);
       dd_destroy (ws.dd_total[v]);
+      interaction_destroy (ws.vws[v].iact);
     }
+
   free (ws.vws);
   free (ws.dd_total);
 }

diff --git a/src/ui/gui/pspp-sheet-view.c b/src/ui/gui/pspp-sheet-view.c
index 03b191da5bbd97ccfd193ad1e2d4f7855ede6847..468dbae8e2edd62ec98ac55055a00ead8458bdf0 100644 (file)
--- a/src/ui/gui/pspp-sheet-view.c
+++ b/src/ui/gui/pspp-sheet-view.c
@@ -6606,7 +6606,9 @@ pspp_sheet_view_focus_column (PsppSheetView *tree_view,
   if (!focus_column->button)
     {
       pspp_sheet_view_column_set_need_button (focus_column, TRUE);
-      g_return_if_fail (focus_column->button != NULL);
+      //      g_return_if_fail (focus_column->button != NULL);
+      if (focus_column->button == NULL)
+       return;
     }
 
   if (GTK_CONTAINER (tree_view)->focus_child != focus_column->button)