diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-21 11:03:30 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-21 11:03:30 +0000 |
| commit | 27f7d88c840a704b1b41324ace2e0fd3c2806857 (patch) | |
| tree | 924290365ef9fa9081ef7aede148bdd47a51aeb0 /gtk | |
| parent | 1108352f008b3fb0e53c56110edc71af507734b0 (diff) | |
Also fake empty field_info's by gracefully handling NULL field_info pointer elsewhere.
svn path=/trunk/; revision=29490
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/expert_comp_table.c | 3 | ||||
| -rw-r--r-- | gtk/main_proto_draw.c | 2 | ||||
| -rw-r--r-- | gtk/rtp_analysis.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c index 8e799b8cf7..701eb4b500 100644 --- a/gtk/expert_comp_table.c +++ b/gtk/expert_comp_table.c @@ -577,7 +577,8 @@ init_error_table_row(error_equiv_table *err, const expert_info_t *expert_data) /* If an expert item was passed then build the filter string */ if (expert_data->pitem) { char *filter; - + + g_assert(PITEM_FINFO(expert_data->pitem)); filter = proto_construct_match_selected_string(PITEM_FINFO(expert_data->pitem), NULL); if (filter != NULL) procedure->fvalue_value = g_string_chunk_insert(err->text, filter); diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c index 1bde6b5755..c7d4f3ce2e 100644 --- a/gtk/main_proto_draw.c +++ b/gtk/main_proto_draw.c @@ -1692,6 +1692,8 @@ proto_tree_draw_node(proto_node *node, gpointer data) GtkTreeIter iter; GtkTreePath *path; + g_assert(fi && "dissection with an invisible proto tree?"); + if (PROTO_ITEM_IS_HIDDEN(node) && !prefs.display_hidden_proto_items) return; diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 7279109ec9..3969a6771a 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -3505,6 +3505,8 @@ static gboolean process_node(proto_node *ptree_node, header_field_info *hfinform finfo = PNODE_FINFO(ptree_node); + g_assert(finfo && "Caller passed top of the protocol tree. Expected child node"); + if (hfinformation==(finfo->hfinfo)) { hfssrc = proto_registrar_get_byname(proto_field); if (hfssrc == NULL) |