From 40e322c1229f08a9b8551a231e6ab59fb99b0de7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 20 Jan 2005 13:12:35 +0000 Subject: [PATCH] Don't crash if the tree is empty. (#164669, Priit Laes) 2005-01-20 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash if the tree is empty. (#164669, Priit Laes) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 3 ++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9739972812..95a6e412ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-20 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash + if the tree is empty. (#164669, Priit Laes) + Wed Jan 19 18:57:02 2005 Manish Singh * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9739972812..95a6e412ac 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-01-20 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash + if the tree is empty. (#164669, Priit Laes) + Wed Jan 19 18:57:02 2005 Manish Singh * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9739972812..95a6e412ac 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-01-20 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_search_move): Don't crash + if the tree is empty. (#164669, Priit Laes) + Wed Jan 19 18:57:02 2005 Manish Singh * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Call diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 836bd6f196..2f6c5d6276 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -12497,7 +12497,8 @@ gtk_tree_view_search_move (GtkWidget *window, /* search */ gtk_tree_selection_unselect_all (selection); - gtk_tree_model_get_iter_first (model, &iter); + if (!gtk_tree_model_get_iter_first (model, &iter)) + return; ret = gtk_tree_view_search_iter (model, selection, &iter, text, &count, up?((tree_view->priv->selected_iter) - 1):((tree_view->priv->selected_iter + 1)));