diff --git a/ChangeLog b/ChangeLog index 2022817314..20eeb8559d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-13 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_header_focus): Reorganize slightly + to avoid a possible NULL dereference. (Coverity) + 2006-04-12 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_get_arrow_xrange): Don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2022817314..20eeb8559d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-04-13 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_header_focus): Reorganize slightly + to avoid a possible NULL dereference. (Coverity) + 2006-04-12 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_get_arrow_xrange): Don't diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 3949bc481d..c53d0e0103 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -6855,9 +6855,10 @@ gtk_tree_view_header_focus (GtkTreeView *tree_view, { for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next) if (GTK_TREE_VIEW_COLUMN (tmp_list->data)->button == focus_child) - break; - - tree_view->priv->focus_column = GTK_TREE_VIEW_COLUMN (tmp_list->data); + { + tree_view->priv->focus_column = GTK_TREE_VIEW_COLUMN (tmp_list->data); + break; + } /* If the following isn't true, then the view is smaller then the scrollpane. */