diff --git a/ChangeLog b/ChangeLog index 6033c0b0f6..e24ebc36f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 18 21:05:05 2003 Christian Persch + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix + mem leaks (#119435). + Tue Nov 18 20:51:38 2003 Kristian Rietveld * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted): don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6033c0b0f6..e24ebc36f5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Nov 18 21:05:05 2003 Christian Persch + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix + mem leaks (#119435). + Tue Nov 18 20:51:38 2003 Kristian Rietveld * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted): don't diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6033c0b0f6..e24ebc36f5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Nov 18 21:05:05 2003 Christian Persch + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix + mem leaks (#119435). + Tue Nov 18 20:51:38 2003 Kristian Rietveld * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted): don't diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6033c0b0f6..e24ebc36f5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Nov 18 21:05:05 2003 Christian Persch + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix + mem leaks (#119435). + Tue Nov 18 20:51:38 2003 Kristian Rietveld * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted): don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6033c0b0f6..e24ebc36f5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Nov 18 21:05:05 2003 Christian Persch + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_inserted): fix + mem leaks (#119435). + Tue Nov 18 20:51:38 2003 Kristian Rietveld * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_deleted): don't diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index f8827691fe..15aca9ae21 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -1139,8 +1139,8 @@ gtk_tree_model_filter_row_inserted (GtkTreeModel *c_model, gpointer data) { GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (data); - GtkTreePath *path; - GtkTreePath *real_path; + GtkTreePath *path = NULL; + GtkTreePath *real_path = NULL; GtkTreeIter iter; GtkTreeIter real_c_iter; @@ -1319,14 +1319,19 @@ done_and_emit: FALSE, TRUE); if (!path) - return; + goto done; gtk_tree_model_filter_increment_stamp (filter); gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path); gtk_tree_model_row_inserted (GTK_TREE_MODEL (data), path, &iter); + gtk_tree_path_free (path); + done: + if (real_path) + gtk_tree_path_free (real_path); + if (free_c_path) gtk_tree_path_free (c_path); }