From 3eb5db0eb991cb2796c1e36ccf8da2d57cbbe8d1 Mon Sep 17 00:00:00 2001 From: Yasuyuki Tanaka Date: Wed, 28 Jun 2017 10:10:21 +0900 Subject: ieee802154: fix a bug preventing Payload Terminate IE dissection Bug: 13867 Change-Id: Ib251b8646ddf428f0aa053dd91b613c027145d20 Reviewed-on: https://code.wireshark.org/review/22499 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman (cherry picked from commit 2c58ed569ed0c096d5640fd0da5825bcfef04aeb) Reviewed-on: https://code.wireshark.org/review/22502 --- epan/dissectors/packet-ieee802154.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index e3c5f0d9ea..6615417bb6 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -2959,7 +2959,7 @@ dissect_ieee802154_payload_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree offset += pie_length; } } - } while ((tvb_reported_length_remaining(tvb, offset) - IEEE802154_FCS_LEN > 1) + } while ((tvb_reported_length_remaining(tvb, offset) > 1) && (pie_id != IEEE802154_PAYLOAD_IE_GID_TERM)); // Once the dissection is over, the length of the header is known -- cgit v1.2.1