From 0cb87b738982be7477364df49cd535b380a6ad6b Mon Sep 17 00:00:00 2001 From: Rody Liu Date: Fri, 7 Sep 2018 14:01:10 +0200 Subject: nas_5gs: can't decode 5GS NAS PDU when there are multiple NSSAIs. Use dummy length in proto_tree_add_subtree_format(), proto_item_set_len() will set the correct length later. Bug: 15120 Change-Id: I7a56f3d1541b75eb53bc03750b6402a8b78a8251 Reviewed-on: https://code.wireshark.org/review/29465 Petri-Dish: Anders Broman Reviewed-by: Anders Broman --- epan/dissectors/packet-nas_5gs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c index ab0fa2b9a4..2bb0c2e7a3 100644 --- a/epan/dissectors/packet-nas_5gs.c +++ b/epan/dissectors/packet-nas_5gs.c @@ -1076,8 +1076,7 @@ de_nas_5gs_mm_nssai(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, curr_offset = offset; while ((curr_offset - offset) < len) { - - sub_tree = proto_tree_add_subtree_format(tree, tvb, curr_offset, len, ett_nas_5gs_mm_nssai, &item, "S-NSSAI %u", i); + sub_tree = proto_tree_add_subtree_format(tree, tvb, curr_offset, 2, ett_nas_5gs_mm_nssai, &item, "S-NSSAI %u", i); proto_tree_add_item_ret_uint(sub_tree, hf_nas_5gs_mm_length, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &length); curr_offset++; -- cgit v1.2.3