diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-22 16:16:23 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-06-22 23:16:43 +0000 |
| commit | 79c384d1d1322f88f91ef3ecbd98244e6031c0c1 (patch) | |
| tree | 95358aba7bfbc516a20377c4605c6657187beadc /epan | |
| parent | eaf62bbf86638625cc9794f635b7ab7c70fba4bb (diff) | |
Don't use the value of the Flags field if we didn't have it.
Change-Id: Idd7771bd39ee823981b31b827645abd2ae516f66
Reviewed-on: https://code.wireshark.org/review/9039
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ieee80211-radiotap.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c index 16af6a0544..479977fcb7 100644 --- a/epan/dissectors/packet-ieee80211-radiotap.c +++ b/epan/dissectors/packet-ieee80211-radiotap.c @@ -1209,11 +1209,13 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) * but used" for that purpose, according to * the radiotap.org page for that field. */ - phdr.presence_flags |= PHDR_802_11_HAS_SHORT_GI; - if (rflags & 0x80) - phdr.short_gi = 1; - else - phdr.short_gi = 0; + if (have_rflags) { + phdr.presence_flags |= PHDR_802_11_HAS_SHORT_GI; + if (rflags & 0x80) + phdr.short_gi = 1; + else + phdr.short_gi = 0; + } break; case IEEE80211_CHAN_G|IEEE80211_CHAN_HT20: @@ -1229,11 +1231,13 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) * but used" for that purpose, according to * the radiotap.org page for that field. */ - phdr.presence_flags |= PHDR_802_11_HAS_SHORT_GI; - if (rflags & 0x80) - phdr.short_gi = 1; - else - phdr.short_gi = 0; + if (have_rflags) { + phdr.presence_flags |= PHDR_802_11_HAS_SHORT_GI; + if (rflags & 0x80) + phdr.short_gi = 1; + else + phdr.short_gi = 0; + } break; } freq = tvb_get_letohs(tvb, offset + 4); |