From 415296436bd8c83339783cb1e870c7b97a5437c0 Mon Sep 17 00:00:00 2001 From: Bernhard Dick Date: Wed, 30 Nov 2022 19:29:28 +0100 Subject: [PATCH] DECT-MITEL-ETH: Fix #18683 Adds missing NULL-termination in headerfield list in dissect_dect_mitel_eth_mac_con_ind and removes handover to general data dissector as this is path is no longer reached due to handling the different message types within this dissector. --- epan/dissectors/packet-dect-mitel-eth.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/epan/dissectors/packet-dect-mitel-eth.c b/epan/dissectors/packet-dect-mitel-eth.c index 9c6aa08bef..ffe065ea96 100644 --- a/epan/dissectors/packet-dect-mitel-eth.c +++ b/epan/dissectors/packet-dect-mitel-eth.c @@ -194,7 +194,6 @@ static gint ett_dect_mitel_eth_mac_capabilities_flags = -1; static gint ett_dect_mitel_eth_extended_capabilities2_mac_capability_flags = -1; static gint ett_dect_mitel_eth_extended_capabilities2_flags = -1; -static dissector_handle_t data_handle; static dissector_handle_t dlc_handle; #define DECT_MITEL_ETH_T_XDLC 0xA000 @@ -981,6 +980,7 @@ static guint dissect_dect_mitel_eth_mac_con_ind(tvbuff_t *tvb, packet_info *pinf { static int *const mac_con_ind_flags[] = { &hf_dect_mitel_eth_mac_con_ind_flag_handover, + NULL }; pinfo->p2p_dir = P2P_DIR_RECV; @@ -1287,9 +1287,6 @@ static int dissect_dect_mitel_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree break; } - if (payload_tvb) - call_dissector(data_handle, payload_tvb, pinfo, tree); - return tvb_captured_length(tvb); } @@ -2011,7 +2008,6 @@ void proto_reg_handoff_dect_mitel_eth(void) create_dissector_handle(dissect_dect_mitel_eth, proto_dect_mitel_eth); dissector_add_uint("ethertype", DECT_MITEL_ETH_T_XDLC, dect_mitel_eth_handle); - data_handle = find_dissector("data"); dlc_handle = find_dissector("dect_dlc"); }