From 20bce6f63a3f62d07741f1feb2561b27b42f93d9 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Tue, 31 Jan 2017 23:48:27 -0500 Subject: [PATCH] packet-btle.c: If frame information is missing, provide a default. "default" frame information sets no retransmission or more fragments. Bug: 13015 Change-Id: I1c8a29fe06d0b38abc789c8e454dc484490186f9 Reviewed-on: https://code.wireshark.org/review/19891 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-btle.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index 275e751de9..103fe45ec9 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -746,6 +746,7 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) btle_frame_info_t *btle_frame_info = NULL; fragment_head *frag_btl2cap_msg = NULL; + btle_frame_info_t empty_btle_frame_info = {0, 0}; key[0].length = 1; key[0].key = &interface_id; @@ -840,7 +841,9 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } } - DISSECTOR_ASSERT(btle_frame_info != NULL); + if (btle_frame_info == NULL) { + btle_frame_info = &empty_btle_frame_info; + } data_header_item = proto_tree_add_item(btle_tree, hf_data_header, tvb, offset, 2, ENC_LITTLE_ENDIAN); data_header_tree = proto_item_add_subtree(data_header_item, ett_data_header);