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

Don't allow passing NULL for x1 or x2, adjust callers.

Browse Source 
2006-04-12  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_get_arrow_xrange): Don't
	allow passing NULL for x1 or x2, adjust callers.
This commit is contained in:
Matthias Clasen
2006-04-13 03:40:48 +00:00
committed by Matthias Clasen
parent 8557b5e2d7
commit 3014a278ed
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-04-12 Matthias Clasen <mclasen@redhat.com> 2006-04-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_get_arrow_xrange): Don't
allow passing NULL for x1 or x2, adjust callers.
* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes): * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes):
Reorganize to avoid a possible NULL pointer dereference. (Coverity) Reorganize to avoid a possible NULL pointer dereference. (Coverity)

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2006-04-12 Matthias Clasen <mclasen@redhat.com> 2006-04-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_get_arrow_xrange): Don't
allow passing NULL for x1 or x2, adjust callers.
* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes): * gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes):
Reorganize to avoid a possible NULL pointer dereference. (Coverity) Reorganize to avoid a possible NULL pointer dereference. (Coverity)

22
gtk/gtktreeview.c
View File

@ -7731,23 +7731,14 @@ gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
else else
x_offset += tree_view->priv->expander_size * _gtk_rbtree_get_depth (tree); x_offset += tree_view->priv->expander_size * _gtk_rbtree_get_depth (tree);
} }
if (x1)
{
*x1 = x_offset;
}
*x1 = x_offset;
if (tmp_column && tmp_column->visible) if (tmp_column && tmp_column->visible)
{ /* +1 because x2 isn't included in the range. */
/* +1 because x2 isn't included in the range. */ *x2 = *x1 + tree_view->priv->expander_size + 1;
if (x2)
*x2 = *x1 + tree_view->priv->expander_size + 1;
}
else else
{ *x2 = *x1;
/* return an empty range, the expander column is hidden */
if (x2)
*x2 = *x1;
}
} }
static void static void
@ -8479,6 +8470,7 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
GtkStateType state; GtkStateType state;
GtkWidget *widget; GtkWidget *widget;
gint x_offset = 0; gint x_offset = 0;
gint x2;
gint vertical_separator; gint vertical_separator;
gint expander_size; gint expander_size;
GtkExpanderStyle expander_style; GtkExpanderStyle expander_style;
@ -8493,7 +8485,7 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
widget = GTK_WIDGET (tree_view); widget = GTK_WIDGET (tree_view);
gtk_tree_view_get_arrow_xrange (tree_view, tree, &x_offset, NULL); gtk_tree_view_get_arrow_xrange (tree_view, tree, &x_offset, &x2);
area.x = x_offset; area.x = x_offset;
area.y = CELL_FIRST_PIXEL (tree_view, tree, node, vertical_separator); area.y = CELL_FIRST_PIXEL (tree_view, tree, node, vertical_separator);