X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Foneway.c;h=6ad71f14c829fc75a91b63e89854f18d9fc3b179;hb=e8817e13d19ffdaefd717d34ea6b83dc421e081b;hp=a61286255674fede14891abce111cd640c2970d5;hpb=8f7af0acaf8a9253242d89fcdb26e285841f7833;p=pspp

diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c
index a612862556..6ad71f14c8 100644
--- a/src/language/stats/oneway.c
+++ b/src/language/stats/oneway.c
@@ -709,8 +709,8 @@ run_oneway (const struct oneway_spec *cmd,
   struct oneway_workspace ws;
 
   ws.actual_number_of_groups = 0;
-  ws.vws = xzalloc (cmd->n_vars * sizeof (*ws.vws));
-  ws.dd_total = xmalloc (sizeof (struct descriptive_data) * cmd->n_vars);
+  ws.vws = xcalloc (cmd->n_vars, sizeof (*ws.vws));
+  ws.dd_total = XCALLOC (cmd->n_vars, struct descriptive_data*);
 
   for (v = 0 ; v < cmd->n_vars; ++v)
     ws.dd_total[v] = dd_create (cmd->vars[v]);
@@ -772,7 +772,7 @@ run_oneway (const struct oneway_spec *cmd,
 
 	  if (MISS_ANALYSIS == cmd->missing_type)
 	    {
-	      if (var_is_value_missing (v, val, cmd->exclude))
+	      if (var_is_value_missing (v, val) & cmd->exclude)
 		continue;
 	    }
 
@@ -795,7 +795,7 @@ run_oneway (const struct oneway_spec *cmd,
 
 	  if (MISS_ANALYSIS == cmd->missing_type)
 	    {
-	      if (var_is_value_missing (v, val, cmd->exclude))
+	      if (var_is_value_missing (v, val) & cmd->exclude)
 		continue;
 	    }
 
@@ -819,7 +819,7 @@ run_oneway (const struct oneway_spec *cmd,
 
 	  if (MISS_ANALYSIS == cmd->missing_type)
 	    {
-	      if (var_is_value_missing (v, val, cmd->exclude))
+	      if (var_is_value_missing (v, val) & cmd->exclude)
 		continue;
 	    }