From 442f621017ddc7c4544881cefd078498d4912d9b Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 5 Jan 2019 01:23:43 +0100 Subject: dect-dlc: Don't call NWK dissector if there's no payload Change-Id: Ia86185f52b724be61db2d94ffaf51fd00ebab84c --- epan/dissectors/packet-dect-dlc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/epan/dissectors/packet-dect-dlc.c b/epan/dissectors/packet-dect-dlc.c index c021cdb6ad..a10303d840 100644 --- a/epan/dissectors/packet-dect-dlc.c +++ b/epan/dissectors/packet-dect-dlc.c @@ -139,12 +139,14 @@ static int dissect_dect_dlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, len = length >> 2; available_length = tvb_captured_length(tvb) - 3; - payload = tvb_new_subset_length_caplen(tvb, 3, MIN(len, available_length), len); + if (available_length > 0) { + payload = tvb_new_subset_length_caplen(tvb, 3, MIN(len, available_length), len); - /* FIXME: fragment reassembly like in packet-lapdm.c */ + /* FIXME: fragment reassembly like in packet-lapdm.c */ - if (!dissector_try_uint(dlc_sapi_dissector_table, sapi, payload, pinfo, tree)) - call_data_dissector(payload, pinfo, tree); + if (!dissector_try_uint(dlc_sapi_dissector_table, sapi, payload, pinfo, tree)) + call_data_dissector(payload, pinfo, tree); + } return tvb_captured_length(tvb); } -- cgit v1.2.3