AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtktreeview: Fix child access after TEST_EXPAND_ROW

Browse Source 
In gtk_tree_view_build_tree with recurse=TRUE, the TEST_EXPAND_ROW
signal might invalidate the child iterator. Getting the iterator after
the signal (instead of before) fixes the issue.

Fixes https://gitlab.com/inkscape/inkscape/-/issues/1879
This commit is contained in:
Thomas Holder 2020-09-22 09:27:29 +02:00 committed by Matthias Clasen
parent 5e4180b5f0
commit 4325c20013
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtktreeview.c
View File

@ -8616,13 +8616,13 @@ gtk_tree_view_build_tree (GtkTreeView *tree_view,
else
gtk_tree_path_next (path);
if (gtk_tree_model_iter_children (priv->model, &child, iter))
if (gtk_tree_model_iter_has_child (priv->model, iter))
{
gboolean expand;
g_signal_emit (tree_view, tree_view_signals[TEST_EXPAND_ROW], 0, iter, path, &expand);
if (gtk_tree_model_iter_has_child (priv->model, iter)
if (gtk_tree_model_iter_children (priv->model, &child, iter)
&& !expand)
{
temp->children = gtk_tree_rbtree_new ();