diff options
| -rw-r--r-- | asn1/ansi_map/packet-ansi_map-template.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-ansi_map.c | 14 |
2 files changed, 10 insertions, 14 deletions
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index e94a3f9892..c49940d266 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -4377,17 +4377,15 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data ansi_map_sms_tele_id = -1; g_pinfo = pinfo; g_tree = tree; + + /* The TCAP dissector should have provided data but didn't so reject it. */ + if (data == NULL) + return 0; /* * Make entry in the Protocol column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "ANSI MAP"); - /* Data from the TCAP dissector */ - if (data == NULL){ - proto_tree_add_text(tree, tvb, 0, -1, "Dissector ERROR this dissector relies on dissector data"); - return 0; - } - /* * create the ansi_map protocol tree */ diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 8f90e001d1..e54a8450e9 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -16255,17 +16255,15 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data ansi_map_sms_tele_id = -1; g_pinfo = pinfo; g_tree = tree; + + /* The TCAP dissector should have provided data but didn't so reject it. */ + if (data == NULL) + return 0; /* * Make entry in the Protocol column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "ANSI MAP"); - /* Data from the TCAP dissector */ - if (data == NULL){ - proto_tree_add_text(tree, tvb, 0, -1, "Dissector ERROR this dissector relies on dissector data"); - return 0; - } - /* * create the ansi_map protocol tree */ @@ -19346,7 +19344,7 @@ void proto_register_ansi_map(void) { NULL, HFILL }}, /*--- End of included file: packet-ansi_map-hfarr.c ---*/ -#line 5279 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 5277 "../../asn1/ansi_map/packet-ansi_map-template.c" }; /* List of subtrees */ @@ -19607,7 +19605,7 @@ void proto_register_ansi_map(void) { &ett_ansi_map_ReturnData, /*--- End of included file: packet-ansi_map-ettarr.c ---*/ -#line 5312 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 5310 "../../asn1/ansi_map/packet-ansi_map-template.c" }; static const enum_val_t ansi_map_response_matching_type_values[] = { |