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-btl2cap.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-btl2cap.c')
-rw-r--r-- | epan/dissectors/packet-btl2cap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index a22fade5d2..046d5c25fd 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -1621,6 +1621,11 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) bthci_acl_data_t *acl_data; btl2cap_data_t *l2cap_data; + /* Reject the packet if data is NULL */ + if (data == NULL) + return 0; + acl_data = (bthci_acl_data_t *) data; + ti = proto_tree_add_item(tree, proto_btl2cap, tvb, offset, -1, ENC_NA); btl2cap_tree = proto_item_add_subtree(ti, ett_btl2cap); @@ -1639,9 +1644,6 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; } - acl_data = (bthci_acl_data_t *) data; - DISSECTOR_ASSERT(acl_data); - length = tvb_get_letohs(tvb, offset); proto_tree_add_item(btl2cap_tree, hf_btl2cap_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; |