Commit 3ea41a92 authored by Marco Pesenti Gritti's avatar Marco Pesenti Gritti Committed by Marco Pesenti Gritti

Check that index is not bigger than level array length also when depth is

2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>

        * gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):

        Check that index is not bigger than level array length
        also when depth is 1. Now get_iter_first correctly return
        FALSE when the model is empty (#129411).
parent b1187d9e
2003-12-17 Marco Pesenti Gritti <marco@gnome.org>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
Check that index is not bigger than level array length
also when depth is 1. Now get_iter_first correctly return
FALSE when the model is empty (#129411).
Wed Dec 17 23:31:19 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_search_equal_func): only
......
2003-12-17 Marco Pesenti Gritti <marco@gnome.org>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
Check that index is not bigger than level array length
also when depth is 1. Now get_iter_first correctly return
FALSE when the model is empty (#129411).
Wed Dec 17 23:31:19 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_search_equal_func): only
......
2003-12-17 Marco Pesenti Gritti <marco@gnome.org>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
Check that index is not bigger than level array length
also when depth is 1. Now get_iter_first correctly return
FALSE when the model is empty (#129411).
Wed Dec 17 23:31:19 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_search_equal_func): only
......
2003-12-17 Marco Pesenti Gritti <marco@gnome.org>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
Check that index is not bigger than level array length
also when depth is 1. Now get_iter_first correctly return
FALSE when the model is empty (#129411).
Wed Dec 17 23:31:19 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_search_equal_func): only
......
2003-12-17 Marco Pesenti Gritti <marco@gnome.org>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
Check that index is not bigger than level array length
also when depth is 1. Now get_iter_first correctly return
FALSE when the model is empty (#129411).
Wed Dec 17 23:31:19 2003 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_search_equal_func): only
......
......@@ -970,8 +970,12 @@ gtk_tree_model_sort_get_iter (GtkTreeModel *tree_model,
level = g_array_index (level->array, SortElt, indices[i]).children;
}
if (level == NULL)
return FALSE;
if (!level || indices[i] >= level->array->len)
{
iter->stamp = 0;
return FALSE;
}
iter->stamp = tree_model_sort->stamp;
iter->user_data = level;
iter->user_data2 = &g_array_index (level->array, SortElt, indices[depth - 1]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment