From b95c4f0bb393bd91cb04df6c5f6f608ba2f30c48 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sat, 24 Nov 2001 17:32:27 +0000 Subject: [PATCH] free path before we return (in case of a failure here) Sat Nov 24 15:35:26 2001 Kristian Rietveld * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before we return (in case of a failure here) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreemodel.c | 5 ++++- 8 files changed, 39 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8f7e4d899d..abe4f03913 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Nov 24 15:35:26 2001 Kristian Rietveld + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before + we return (in case of a failure here) + Fri Nov 23 19:22:50 2001 Owen Taylor * gtk/gtknotebook.c: Handle events in windows other diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8f7e4d899d..abe4f03913 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sat Nov 24 15:35:26 2001 Kristian Rietveld + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before + we return (in case of a failure here) + Fri Nov 23 19:22:50 2001 Owen Taylor * gtk/gtknotebook.c: Handle events in windows other diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8f7e4d899d..abe4f03913 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Nov 24 15:35:26 2001 Kristian Rietveld + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before + we return (in case of a failure here) + Fri Nov 23 19:22:50 2001 Owen Taylor * gtk/gtknotebook.c: Handle events in windows other diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8f7e4d899d..abe4f03913 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat Nov 24 15:35:26 2001 Kristian Rietveld + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before + we return (in case of a failure here) + Fri Nov 23 19:22:50 2001 Owen Taylor * gtk/gtknotebook.c: Handle events in windows other diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8f7e4d899d..abe4f03913 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Nov 24 15:35:26 2001 Kristian Rietveld + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before + we return (in case of a failure here) + Fri Nov 23 19:22:50 2001 Owen Taylor * gtk/gtknotebook.c: Handle events in windows other diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8f7e4d899d..abe4f03913 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Nov 24 15:35:26 2001 Kristian Rietveld + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before + we return (in case of a failure here) + Fri Nov 23 19:22:50 2001 Owen Taylor * gtk/gtknotebook.c: Handle events in windows other diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8f7e4d899d..abe4f03913 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Nov 24 15:35:26 2001 Kristian Rietveld + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before + we return (in case of a failure here) + Fri Nov 23 19:22:50 2001 Owen Taylor * gtk/gtknotebook.c: Handle events in windows other diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index e71c5b26fd..05b2c4747e 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -1169,7 +1169,10 @@ gtk_tree_model_foreach (GtkTreeModel *model, path = gtk_tree_path_new_root (); if (gtk_tree_model_get_iter (model, &iter, path) == FALSE) - return; + { + gtk_tree_path_free (path); + return; + } gtk_tree_model_foreach_helper (model, &iter, path, func, user_data); gtk_tree_path_free (path);