summaryrefslogtreecommitdiff
path: root/asn1
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 /asn1
parentacc5fd78e48016eaf932b78ef29f5f2db96b45cc (diff)
downloadwireshark-9b38829b34ceda59c7a35c34f2ed071618477ef1.tar.gz
Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53708
Diffstat (limited to 'asn1')
-rw-r--r--asn1/ansi_map/packet-ansi_map-template.c10
1 files changed, 4 insertions, 6 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
*/