diff options
| author | Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp> | 2017-06-28 10:10:21 +0900 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-07-03 12:53:26 +0000 |
| commit | 3eb5db0eb991cb2796c1e36ccf8da2d57cbbe8d1 (patch) | |
| tree | d0625951fe21a72ec734a69dc130cc35b21e215d | |
| parent | 81f98e4e1c8225b13f8d1a8960ab023a022045b6 (diff) | |
| download | wireshark-master-2.4.tar.gz | |
ieee802154: fix a bug preventing Payload Terminate IE dissectionmaster-2.4
Bug: 13867
Change-Id: Ib251b8646ddf428f0aa053dd91b613c027145d20
Reviewed-on: https://code.wireshark.org/review/22499
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 2c58ed569ed0c096d5640fd0da5825bcfef04aeb)
Reviewed-on: https://code.wireshark.org/review/22502
| -rw-r--r-- | epan/dissectors/packet-ieee802154.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |