Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix another Coverity bug

Browse Source
This commit is contained in:
Matthias Clasen
2006-04-12 21:20:03 +00:00
parent b898f3379a
commit 8561c5fe6b
3 changed files with 13 additions and 5 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>
* 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)

3
ChangeLog.pre-2-10
View File

@@ -1,5 +1,8 @@
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)

12
gtk/gtknotebook.c
View File

@@ -3648,13 +3648,10 @@ gtk_notebook_page_allocate (GtkNotebook *notebook,
gint focus_width;
gint tab_pos = get_effective_tab_pos (notebook);
gtk_widget_style_get (widget, "focus-line-width", &focus_width, NULL);
xthickness = widget->style->xthickness;
ythickness = widget->style->ythickness;
page->allocation = *allocation;
gtk_widget_get_child_requisition (page->tab_label, &tab_requisition);
if (notebook->cur_page != page)
{
@@ -3672,6 +3669,12 @@ gtk_notebook_page_allocate (GtkNotebook *notebook,
break;
}
}
if (!page->tab_label)
return;
gtk_widget_style_get (widget, "focus-line-width", &focus_width, NULL);
gtk_widget_get_child_requisition (page->tab_label, &tab_requisition);
switch (tab_pos)
{
@@ -3724,8 +3727,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