diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-05-19 16:55:22 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-05-19 16:55:22 +0000 |
| commit | 576fcd2a4766302c04c8aa11b076e169ef9ca284 (patch) | |
| tree | 460289b7cfefbc1149893035b7c8d8b94170f9a3 /ui/gtk/conversations_table.c | |
| parent | 12ba85a2a4988c6c0b91c17572b4a8c7a6c54b8d (diff) | |
| download | wireshark-576fcd2a4766302c04c8aa11b076e169ef9ca284.tar.gz | |
Rework 'ct_nb_switch_page_cb()' slightly to prevent a scan-build "null pointer de-reference" message;
(In practice, the "null pointer de-reference" would not actually occur ?).
svn path=/trunk/; revision=42718
Diffstat (limited to 'ui/gtk/conversations_table.c')
| -rw-r--r-- | ui/gtk/conversations_table.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index fd8a82b779..82c456712c 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -2586,27 +2586,28 @@ init_conversation_table(gboolean hide_ports, const char *table_name, const char static void ct_nb_switch_page_cb(GtkNotebook *nb, gpointer *pg _U_, guint page, gpointer data) { - GtkWidget *copy_bt = (GtkWidget *) data; - GtkWidget *follow_stream_bt = g_object_get_data(G_OBJECT(nb), FOLLOW_STREAM_BT_KEY); - void **pages = g_object_get_data(G_OBJECT(nb), NB_PAGES_KEY); + GtkWidget *copy_bt = (GtkWidget *) data; + GtkWidget *follow_stream_bt = g_object_get_data(G_OBJECT(nb), FOLLOW_STREAM_BT_KEY); + void **pages = g_object_get_data(G_OBJECT(nb), NB_PAGES_KEY); page++; - if (pages && page > 0 && (int) page <= GPOINTER_TO_INT(pages[0]) && copy_bt) { + /* XXX: is the 'if' test really needed ?? */ + if (pages && (page > 0) && ((int) page <= GPOINTER_TO_INT(pages[0]))) { g_object_set_data(G_OBJECT(copy_bt), CONV_PTR_KEY, pages[page]); g_object_set_data(G_OBJECT(follow_stream_bt), CONV_PTR_KEY, pages[page]); - } - /* Filter Stream only available for TCP and UDP */ - if (strcmp(((conversations_table *)pages[page])->name, "TCP") == 0) { - gtk_widget_set_tooltip_text(follow_stream_bt, "Follow TCP Stream."); - gtk_widget_set_sensitive(follow_stream_bt, TRUE); - } else if (strcmp(((conversations_table *)pages[page])->name, "UDP") == 0) { - gtk_widget_set_tooltip_text(follow_stream_bt, "Follow UDP Stream."); - gtk_widget_set_sensitive(follow_stream_bt, TRUE); - } else { - gtk_widget_set_tooltip_text(follow_stream_bt, "Follow TCP or UDP Stream."); - gtk_widget_set_sensitive(follow_stream_bt, FALSE); + /* Filter Stream only available for TCP and UDP */ + if (strcmp(((conversations_table *)pages[page])->name, "TCP") == 0) { + gtk_widget_set_tooltip_text(follow_stream_bt, "Follow TCP Stream."); + gtk_widget_set_sensitive(follow_stream_bt, TRUE); + } else if (strcmp(((conversations_table *)pages[page])->name, "UDP") == 0) { + gtk_widget_set_tooltip_text(follow_stream_bt, "Follow UDP Stream."); + gtk_widget_set_sensitive(follow_stream_bt, TRUE); + } else { + gtk_widget_set_tooltip_text(follow_stream_bt, "Follow TCP or UDP Stream."); + gtk_widget_set_sensitive(follow_stream_bt, FALSE); + } } } |