Commit 6afcd450 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

Reorganize to avoid a possible NULL dereference. (Coverity)

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

        * gtk/gtknotebook.c (gtk_notebook_page_allocate): Reorganize
        to avoid a possible NULL dereference.  (Coverity)
parent 10e0b3c8
2006-04-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_page_allocate): Reorganize
to avoid a possible NULL dereference. (Coverity)
* gdk/x11/gdkimage-x11.c (gdk_image_new_bitmap): Handle
closed displays correctly. (Coverity)
......
2006-04-12 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_page_allocate): Reorganize
to avoid a possible NULL dereference. (Coverity)
* gdk/x11/gdkimage-x11.c (gdk_image_new_bitmap): Handle
closed displays correctly. (Coverity)
......
......@@ -5134,16 +5134,9 @@ gtk_notebook_page_allocate (GtkNotebook *notebook,
gint tab_curvature;
gint tab_pos = get_effective_tab_pos (notebook);
gtk_widget_style_get (widget,
"focus-line-width", &focus_width,
"tab-curvature", &tab_curvature,
NULL);
xthickness = widget->style->xthickness;
ythickness = widget->style->ythickness;
gtk_widget_get_child_requisition (page->tab_label, &tab_requisition);
if (notebook->cur_page != page)
{
switch (tab_pos)
......@@ -5161,6 +5154,15 @@ gtk_notebook_page_allocate (GtkNotebook *notebook,
}
}
if (!page->tab_label)
return;
gtk_widget_get_child_requisition (page->tab_label, &tab_requisition);
gtk_widget_style_get (widget,
"focus-line-width", &focus_width,
"tab-curvature", &tab_curvature,
NULL);
switch (tab_pos)
{
case GTK_POS_TOP:
......@@ -5212,8 +5214,7 @@ gtk_notebook_page_allocate (GtkNotebook *notebook,
break;
}
if (page->tab_label)
gtk_widget_size_allocate (page->tab_label, &child_allocation);
gtk_widget_size_allocate (page->tab_label, &child_allocation);
}
static void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment