diff options
| author | Kristian Rietveld <kris@gtk.org> | 2009-07-30 14:35:09 +0200 |
|---|---|---|
| committer | Kristian Rietveld <kris@gtk.org> | 2009-07-30 20:24:31 +0200 |
| commit | bce2a5173de6dea42d7cfeee88ab84f8cc6c95b0 (patch) | |
| tree | aab435f034025a2a92d1fe351ea3be8ea2d9815c /gtk/gtktreemodelsort.c | |
| parent | 069a593b0fc73cffe2015558a0c8160c92c61465 (diff) | |
| download | gtk+-bce2a5173de6dea42d7cfeee88ab84f8cc6c95b0.tar.gz | |
Bug 573321 – additional check in gtk_tree_model_filter_convert_*
Added checks to see whether the passed iterators are not the same in
convert_child_iter_to_iter() and iter_to_child_iter() functions in both
the sort and filter models.
Fixes bug 573321, suggestion by Vadim Godunko.
Diffstat (limited to 'gtk/gtktreemodelsort.c')
| -rw-r--r-- | gtk/gtktreemodelsort.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index 1dbdda41f8..4525bca8b1 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -2084,6 +2084,7 @@ gtk_tree_model_sort_convert_child_iter_to_iter (GtkTreeModelSort *tree_model_sor g_return_val_if_fail (tree_model_sort->child_model != NULL, FALSE); g_return_val_if_fail (sort_iter != NULL, FALSE); g_return_val_if_fail (child_iter != NULL, FALSE); + g_return_val_if_fail (sort_iter != child_iter, FALSE); sort_iter->stamp = 0; @@ -2182,6 +2183,7 @@ gtk_tree_model_sort_convert_iter_to_child_iter (GtkTreeModelSort *tree_model_sor g_return_if_fail (tree_model_sort->child_model != NULL); g_return_if_fail (child_iter != NULL); g_return_if_fail (VALID_ITER (sorted_iter, tree_model_sort)); + g_return_if_fail (sorted_iter != child_iter); if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort)) { |