X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Faggregate-dialog.c;h=16ae1ce0cb08a5377ff72e7d5c4071b5293b7f03;hb=48ec61d954cc032c773daf96851cf3b78f27b112;hp=ebc47d401179c464e22ac9d3b7c69ff7d57bfbd2;hpb=7557c4bf71b244226c7a248177715dade26aabe5;p=pspp diff --git a/src/ui/gui/aggregate-dialog.c b/src/ui/gui/aggregate-dialog.c index ebc47d4011..16ae1ce0cb 100644 --- a/src/ui/gui/aggregate-dialog.c +++ b/src/ui/gui/aggregate-dialog.c @@ -226,6 +226,7 @@ populate_combo_model (GtkComboBox *cb) gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (cb), renderer, "text", 0); gtk_combo_box_set_model (GTK_COMBO_BOX (cb), GTK_TREE_MODEL (list)); + g_object_unref (list); } @@ -634,8 +635,8 @@ static void append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *string) { GtkTreeIter combo_iter; - const char *varname; - const char *funcname; + char *varname = NULL; + char *funcname = NULL; GtkTreeModel *acr_model = GTK_TREE_MODEL (PSPPIRE_ACR (agg->summary_acr)->list_store); GtkTreeModel *combo_model = gtk_combo_box_get_model (GTK_COMBO_BOX (agg->function_combo)); @@ -646,8 +647,8 @@ append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *st double arg1, arg2; int arity; enum agr_src_vars has_src_vars; - const gchar *label ; - const gchar *srcvar ; + gchar *label = NULL; + gchar *srcvar = NULL; gtk_tree_model_get (acr_model, iter, SUMMARY_COL_VARNAME, &varname, @@ -694,6 +695,11 @@ append_summary_spec (const struct aggregate *agg, GtkTreeIter *iter, GString *st g_string_append (string, ")"); } + + free (label); + free (srcvar); + free (varname); + free (funcname); }