diff options
author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-02 21:34:23 +0000 |
---|---|---|
committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-02 21:34:23 +0000 |
commit | ae2e12d1f7095afd8ad9dedfb51a5cc1cd29105e (patch) | |
tree | c15cb0980d27620505b28c129e9e0df191ef7f19 /epan/dissectors/packet-btrfcomm.c | |
parent | ce7b83123c75cfcae511f8018a9d4f0594b3a25f (diff) |
Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53735
Diffstat (limited to 'epan/dissectors/packet-btrfcomm.c')
-rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index ab82587ef4..0db57b80df 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -582,6 +582,11 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data btl2cap_data_t *l2cap_data; service_info_t *service_info = NULL; + /* Reject the packet if data is NULL */ + if (data == NULL) + return 0; + l2cap_data = (btl2cap_data_t *) data; + ti = proto_tree_add_item(tree, proto_btrfcomm, tvb, offset, -1, ENC_NA); rfcomm_tree = proto_item_add_subtree(ti, ett_btrfcomm); @@ -600,9 +605,6 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data break; } - l2cap_data = (btl2cap_data_t *) data; - DISSECTOR_ASSERT(l2cap_data); - /* flags and dlci */ offset = dissect_btrfcomm_address(tvb, pinfo, offset, rfcomm_tree, &ea_flag, &cr_flag, &dlci); /* pf and frame type */ |