diff options
| author | Sake Blok <sake@euronet.nl> | 2008-02-02 09:21:09 +0000 |
|---|---|---|
| committer | Sake Blok <sake@euronet.nl> | 2008-02-02 09:21:09 +0000 |
| commit | 0446fc0d945e6e27c1e59dccb7ce1b8786b3b58a (patch) | |
| tree | b46f744bf45ebd1667046e5164e2bcef1fe23a5d /epan | |
| parent | de3c7e9a0b67ab6afebaf6e902c3f1a5cd02f033 (diff) | |
Fix for bug 2202, when an ethernet frame with padding is encountered, the
reported length is 46, so there was a one-off error in the code.
svn path=/trunk/; revision=24244
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-pppoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 0ddc43bb43..5385043944 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -477,7 +477,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * the payload length in the packet, and the amount of * data following the PPPoE header, as an error. */ - if (tvb_reported_length(tvb) >= 46 && + if (tvb_reported_length(tvb) > 46 && reported_payload_length != actual_payload_length) { proto_item_append_text(ti, " [incorrect, should be %u]", actual_payload_length); |