Bug 536730 - memory corruption in gtktreeview

2008-06-08  Kristian Rietveld  <kris@gtk.org>

	Bug 536730 - memory corruption in gtktreeview

	* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): first
	remove the expand/collapse timeout and node, then free the rbtree.


svn path=/trunk/; revision=20334
This commit is contained in:
Kristian Rietveld 2008-06-08 12:53:19 +00:00 committed by Kristian Rietveld
parent 898fe0c82f
commit cd4a1fc680
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2008-06-08 Kristian Rietveld <kris@gtk.org>
Bug 536730 - memory corruption in gtktreeview
* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): first
remove the expand/collapse timeout and node, then free the rbtree.
2008-06-08 Kristian Rietveld <kris@gtk.org>
Bug 488119 - critical warnings from gtk_tree_view_get_visible_range

View File

@ -12217,6 +12217,8 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
gtk_tree_path_free (lsc);
}
remove_expand_collapse_timeout (tree_view);
if (gtk_tree_view_unref_and_check_selection_tree (tree_view, node->children))
{
_gtk_rbtree_remove (node->children);
@ -12224,8 +12226,6 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
}
else
_gtk_rbtree_remove (node->children);
remove_expand_collapse_timeout (tree_view);
if (animate)
add_expand_collapse_timeout (tree_view, tree, node, FALSE);