aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorChris Maynard <Christopher.Maynard@GTECH.COM>2013-12-02 02:31:04 +0000
committerChris Maynard <Christopher.Maynard@GTECH.COM>2013-12-02 02:31:04 +0000
commit9b38829b34ceda59c7a35c34f2ed071618477ef1 (patch)
tree4ab9f6b85f283bf00cb4e8beb2549268177e931d /epan
parentacc5fd78e48016eaf932b78ef29f5f2db96b45cc (diff)
Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53708
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ansi_map.c14
1 files changed, 6 insertions, 8 deletions
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[] = {