From 5751ed9e167df757c5ebb74f8be1943b844a78dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Borgstr=F6m?= Date: Sat, 21 Jul 2001 15:31:19 +0000 Subject: [PATCH] Check the return value from gtk_tree_model_get_iter, the model might be MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2001-07-21 Jonas Borgström * gtk/gtktreemodel.c (gtk_tree_model_foreach): Check the return value from gtk_tree_model_get_iter, the model might be empty. --- 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 | 4 +++- 8 files changed, 38 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3d9a831cbc..596896434e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-07-21 Jonas Borgström + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): Check the return + value from gtk_tree_model_get_iter, the model might be empty. + 2001-07-20 Hans Breuer * gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3d9a831cbc..596896434e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-07-21 Jonas Borgström + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): Check the return + value from gtk_tree_model_get_iter, the model might be empty. + 2001-07-20 Hans Breuer * gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3d9a831cbc..596896434e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-07-21 Jonas Borgström + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): Check the return + value from gtk_tree_model_get_iter, the model might be empty. + 2001-07-20 Hans Breuer * gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3d9a831cbc..596896434e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-07-21 Jonas Borgström + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): Check the return + value from gtk_tree_model_get_iter, the model might be empty. + 2001-07-20 Hans Breuer * gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3d9a831cbc..596896434e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-07-21 Jonas Borgström + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): Check the return + value from gtk_tree_model_get_iter, the model might be empty. + 2001-07-20 Hans Breuer * gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3d9a831cbc..596896434e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-07-21 Jonas Borgström + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): Check the return + value from gtk_tree_model_get_iter, the model might be empty. + 2001-07-20 Hans Breuer * gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3d9a831cbc..596896434e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-07-21 Jonas Borgström + + * gtk/gtktreemodel.c (gtk_tree_model_foreach): Check the return + value from gtk_tree_model_get_iter, the model might be empty. + 2001-07-20 Hans Breuer * gdk/win32/gdkinput-win32.c : gdk_device_get_history moved to diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 5258964482..043d7544f5 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -1127,7 +1127,9 @@ gtk_tree_model_foreach (GtkTreeModel *model, g_return_if_fail (func != NULL); path = gtk_tree_path_new_root (); - gtk_tree_model_get_iter (model, &iter, path); + if (gtk_tree_model_get_iter (model, &iter, path) == FALSE) + return; + gtk_tree_model_foreach_helper (model, &iter, path, func, user_data); gtk_tree_path_free (path); }