AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-15 14:50:06 +00:00
Code Issues Projects Releases Wiki Activity

gtktreeselection: Fix potential NULL pointer dereferences

Browse Source 
_gtk_rbtree_first() can potentially return NULL if the RB tree is empty,
which would result in NULL pointer dereferences in the GtkTreeSelection
code. Gracefully handle them.

Found by scan-build.

https://bugzilla.gnome.org/show_bug.cgi?id=712760
This commit is contained in:
Philip Withnall 2013-11-20 17:38:01 +00:00
parent 4fc6880d83
commit 968780d8da
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtktreeselection.c
View File

@ -596,7 +596,7 @@ gtk_tree_selection_get_selected_rows (GtkTreeSelection *selection,
node = _gtk_rbtree_first (tree);
path = gtk_tree_path_new_first ();
do
while (node != NULL)
{
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
list = g_list_prepend (list, gtk_tree_path_copy (path));
@ -638,7 +638,6 @@ gtk_tree_selection_get_selected_rows (GtkTreeSelection *selection,
while (!done);
}
}
while (TRUE);
gtk_tree_path_free (path);
@ -653,6 +652,8 @@ gtk_tree_selection_count_selected_rows_helper (GtkRBTree *tree,
{
gint *count = (gint *)data;
g_return_if_fail (node != NULL);
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
(*count)++;
@ -789,7 +790,7 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection,
/* find the node internally */
path = gtk_tree_path_new_first ();
do
while (node != NULL)
{
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
{
@ -838,7 +839,6 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection,
while (!done);
}
}
while (TRUE);
out:
if (path)
@ -1614,6 +1614,8 @@ gtk_tree_selection_real_select_node (GtkTreeSelection *selection,
gboolean toggle = FALSE;
GtkTreePath *path = NULL;
g_return_val_if_fail (node != NULL, FALSE);
select = !! select;
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED) != select)