[Pspp-cvs] Changes to pspp/src/aggregate.c

[Ben Pfaff]

Index: pspp/src/aggregate.c
diff -u pspp/src/aggregate.c:1.30 pspp/src/aggregate.c:1.31
--- pspp/src/aggregate.c:1.30   Sun Mar 20 07:08:32 2005
+++ pspp/src/aggregate.c        Tue Apr  5 05:29:58 2005
@@ -545,16 +545,15 @@
                          || function->alpha_type == NUMERIC)
                   {
                     destvar = dict_create_var (agr->dict, dest[i], 0);
-                        
-                    if ((func_index == N || func_index == NMISS)
-                        && dict_get_weight (default_dict) != NULL)
-                      destvar->print = destvar->write = f8_2; 
-                    else
-                      destvar->print = destvar->write = function->format;
+                    if (destvar != NULL) 
+                      {
+                        if ((func_index == N || func_index == NMISS)
+                            && dict_get_weight (default_dict) != NULL)
+                          destvar->print = destvar->write = f8_2; 
+                        else
+                          destvar->print = destvar->write = function->format;
+                      }
                   }
-                else 
-                  destvar = dict_create_var (agr->dict, dest[i],
-                                             v->src->width);
              } else {
                v->src = NULL;
                destvar = dict_create_var (agr->dict, dest[i], 0);
@@ -572,7 +571,6 @@
                           "the aggregate variables and the break "
                           "variables."),
                     dest[i]);
-               free (dest[i]);
                goto error;
              }