callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TreeModelFilter: Fix uninitialized memory read.

Browse Source 
We were copying an iterator that sometimes was not initialized,
which caused debugger warnings in VS2015.
This commit is contained in:
Alexander Larsson 2015-10-29 15:17:44 +01:00
parent 199e35fa5c
commit 1c46a02bcb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtktreemodelfilter.c
View File

@ -1357,20 +1357,20 @@ gtk_tree_model_filter_check_ancestors (GtkTreeModelFilter *filter,
int *indices = gtk_tree_path_get_indices (path);
FilterElt *elt;
FilterLevel *level;
GtkTreeIter c_iter, tmp_iter;
GtkTreeIter c_iter, tmp_iter, *root_iter;
level = FILTER_LEVEL (filter->priv->root);
if (!level)
return;
if (filter->priv->virtual_root)
gtk_tree_model_get_iter (filter->priv->child_model, &c_iter,
filter->priv->virtual_root);
tmp_iter = c_iter;
root_iter = NULL;
if (filter->priv->virtual_root &&
gtk_tree_model_get_iter (filter->priv->child_model, &tmp_iter,
filter->priv->virtual_root))
root_iter = &tmp_iter;
gtk_tree_model_iter_nth_child (filter->priv->child_model, &c_iter,
filter->priv->virtual_root ? &tmp_iter : NULL,
root_iter,
indices[i]);
while (i < gtk_tree_path_get_depth (path) - 1)