osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

ieee802.11: Make sure we do not include the FCS in the next_tvb. 

In some cases we are including the FCS in the next TVB which can screw
up dissection.

Change-Id: Ie721a9ca169828f99d2aef4bd1e1762d06a14070
Reviewed-on: https://code.wireshark.org/review/28848
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Richard Sharpe 2018-07-25 08:23:51 -07:00 committed by Anders Broman
parent 7dd68fce89
commit 094297ec77
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-ieee80211.c
View File

@ -23237,6 +23237,9 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo,
next_tvb = process_reassembled_data(tvb, hdr_len, pinfo,
"Reassembled 802.11", fd_head,
&frag_items, NULL, hdr_tree);
/* If we got a next_tvb, but it has an FCS, strip the FCS */
if (next_tvb && has_fcs)
next_tvb = tvb_new_subset_length_caplen(next_tvb, 0, len, reported_len);
} else {
/*
* If this is the first fragment, dissect its contents, otherwise