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

gtknotebook: Add more non-NULL checks for cur_page

Browse Source 
These were not spotted by scan-build, but from some brief mental
reasoning could potentially be problem areas.

https://bugzilla.gnome.org/show_bug.cgi?id=712760
This commit is contained in:
Philip Withnall
2015-03-10 08:34:39 +00:00
parent 3b45be94e8
commit d65ccf96ee
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtknotebook.c
View File

@ -3401,7 +3401,7 @@ scroll_notebook_timer (gpointer data)
first_tab = gtk_notebook_search_page (notebook, priv->first_tab, first_tab = gtk_notebook_search_page (notebook, priv->first_tab,
(pointer_position == POINTER_BEFORE) ? STEP_PREV : STEP_NEXT, (pointer_position == POINTER_BEFORE) ? STEP_PREV : STEP_NEXT,
TRUE); TRUE);
if (first_tab) if (first_tab && priv->cur_page)
{ {
priv->first_tab = first_tab; priv->first_tab = first_tab;
gtk_notebook_pages_allocate (notebook); gtk_notebook_pages_allocate (notebook);
@ -3692,6 +3692,8 @@ gtk_notebook_drag_begin (GtkWidget *widget,
priv->dnd_timer = 0; priv->dnd_timer = 0;
} }
g_assert (priv->cur_page != NULL);
priv->operation = DRAG_OPERATION_DETACH; priv->operation = DRAG_OPERATION_DETACH;
gtk_notebook_pages_allocate (notebook); gtk_notebook_pages_allocate (notebook);
@ -3827,6 +3829,8 @@ gtk_notebook_drag_motion (GtkWidget *widget,
goto out; goto out;
} }
g_assert (priv->cur_page != NULL);
stop_scrolling (notebook); stop_scrolling (notebook);
target = gtk_drag_dest_find_target (widget, context, NULL); target = gtk_drag_dest_find_target (widget, context, NULL);
tab_target = gdk_atom_intern_static_string ("GTK_NOTEBOOK_TAB"); tab_target = gdk_atom_intern_static_string ("GTK_NOTEBOOK_TAB");
@ -6096,6 +6100,8 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook *notebook,
GtkAllocation child_allocation = { 0, }; GtkAllocation child_allocation = { 0, };
GtkOrientation tab_expand_orientation; GtkOrientation tab_expand_orientation;
g_assert (priv->cur_page != NULL);
widget = GTK_WIDGET (notebook); widget = GTK_WIDGET (notebook);
container = GTK_CONTAINER (notebook); container = GTK_CONTAINER (notebook);
gtk_widget_style_get (widget, "tab-overlap", &tab_overlap, NULL); gtk_widget_style_get (widget, "tab-overlap", &tab_overlap, NULL);