diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-04-02 21:34:51 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-04-04 02:20:52 +0000 |
| commit | bc40ae80759e57d2178b8fde6d25ced5fa5bbf50 (patch) | |
| tree | 573cf54189ceaf2baf3fb48e61d2d0ce825449b3 /epan | |
| parent | 03f372fd8b1512df3d499e1c5d292f9aaf5c8fa4 (diff) | |
| download | wireshark-bc40ae80759e57d2178b8fde6d25ced5fa5bbf50.tar.gz | |
WLCCP: ensure that offset is always incremented in dissect_wlccp_tlvs()
Bug: 13549
Change-Id: I4613d1e2708a65b6e9968a5a920bd1b15366ffe0
Reviewed-on: https://code.wireshark.org/review/20871
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-wlccp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index b9bc260cf8..da01d590b9 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -1976,7 +1976,8 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse default: { - _offset = _tlv_end; + if (_offset < _tlv_end) + _offset = _tlv_end; break; } /* case default for switch _group_id */ @@ -2013,7 +2014,7 @@ static guint dissect_wlccp_tlvs( proto_tree *_tree, tvbuff_t *_tvb, guint _offse /* done with decoding the contained TLVs */ - return(_tlv_end); + return(_tlv_end > _offset ? _tlv_end : _offset); } /* dissect_wlccp_tlvs */ |