From a297af9d6478d5e9cc7666d64fff2daf7808222e Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Sat, 19 May 2012 17:21:32 +0000 Subject: Add an 'if' test to prevent a potential null pointer dereference identified by clang scan-build. svn path=/trunk/; revision=42719 --- ui/gtk/conversations_table.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'ui') diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index 82c456712c..4570b85eb3 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -2765,15 +2765,16 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_) current_table = registered_ct_tables; while(current_table) { registered = current_table->data; - page_lb = gtk_label_new(""); conversations = init_ct_notebook_page_cb(registered->hide_ports, registered->table_name, registered->tap_name, registered->filter, registered->packet_func); - g_object_set_data(G_OBJECT(conversations->win), CONV_PTR_KEY, conversations); - gtk_notebook_append_page(GTK_NOTEBOOK(nb), conversations->win, page_lb); - conversations->win = win; - conversations->page_lb = page_lb; - pages[++page] = conversations; - + if (conversations) { + g_object_set_data(G_OBJECT(conversations->win), CONV_PTR_KEY, conversations); + page_lb = gtk_label_new(""); + gtk_notebook_append_page(GTK_NOTEBOOK(nb), conversations->win, page_lb); + conversations->win = win; + conversations->page_lb = page_lb; + pages[++page] = conversations; + } current_table = g_slist_next(current_table); } -- cgit v1.2.3