diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-28 09:23:04 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-06-28 16:23:30 +0000 |
| commit | 7d7f6be1fc2bbe52d34bc4fc88536e2264c638c8 (patch) | |
| tree | 14afae67448894a1c871f2428dac73abe6bbf7c2 /epan/dissectors/packet-ieee80211-radiotap.c | |
| parent | b09891df959a9dfdc7ec7138352b2dd1db54e505 (diff) | |
We only have the short preamble flag if we have a Flags field.
Don't set PHDR_802_11_HAS_SHORT_PREAMBLE or phdr.short_preamble unless
we have the flags bits from the Flags field.
Discovered by Pascal Quantin by running valgrind on the capture from bug
11317.
Change-Id: I7e91dea116f6cc977101b7b5e76067021f68a0bf
Reviewed-on: https://code.wireshark.org/review/9203
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ieee80211-radiotap.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211-radiotap.c | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c index 756cb12a05..68545a2807 100644 --- a/epan/dissectors/packet-ieee80211-radiotap.c +++ b/epan/dissectors/packet-ieee80211-radiotap.c @@ -829,7 +829,6 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) phdr.fcs_len = 4; else phdr.fcs_len = 0; - phdr.short_preamble = (rflags & IEEE80211_RADIOTAP_F_SHORTPRE) != 0; if (tree) { proto_tree *flags_tree; @@ -964,19 +963,28 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case IEEE80211_CHAN_B: phdr.phy = PHDR_802_11_PHY_11B; - phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + if (have_rflags) { + phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + phdr.short_preamble = (rflags & IEEE80211_RADIOTAP_F_SHORTPRE) != 0; + } break; case IEEE80211_CHAN_PUREG: phdr.phy = PHDR_802_11_PHY_11G; - phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + if (have_rflags) { + phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + phdr.short_preamble = (rflags & IEEE80211_RADIOTAP_F_SHORTPRE) != 0; + } phdr.phy_info.info_11g.presence_flags = PHDR_802_11G_HAS_MODE; phdr.phy_info.info_11g.mode = PHDR_802_11G_MODE_NORMAL; break; case IEEE80211_CHAN_G: phdr.phy = PHDR_802_11_PHY_11G; - phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + if (have_rflags) { + phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + phdr.short_preamble = (rflags & IEEE80211_RADIOTAP_F_SHORTPRE) != 0; + } phdr.phy_info.info_11g.presence_flags = PHDR_802_11G_HAS_MODE; phdr.phy_info.info_11g.mode = PHDR_802_11G_MODE_NORMAL; break; @@ -990,7 +998,10 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case IEEE80211_CHAN_108PUREG: phdr.phy = PHDR_802_11_PHY_11G; - phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + if (have_rflags) { + phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + phdr.short_preamble = (rflags & IEEE80211_RADIOTAP_F_SHORTPRE) != 0; + } phdr.phy_info.info_11g.presence_flags = PHDR_802_11G_HAS_MODE; phdr.phy_info.info_11g.mode = PHDR_802_11G_MODE_SUPER_G; break; @@ -1189,19 +1200,28 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case IEEE80211_CHAN_B: phdr.phy = PHDR_802_11_PHY_11B; - phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + if (have_rflags) { + phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + phdr.short_preamble = (rflags & IEEE80211_RADIOTAP_F_SHORTPRE) != 0; + } break; case IEEE80211_CHAN_PUREG: phdr.phy = PHDR_802_11_PHY_11G; - phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + if (have_rflags) { + phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + phdr.short_preamble = (rflags & IEEE80211_RADIOTAP_F_SHORTPRE) != 0; + } phdr.phy_info.info_11g.presence_flags = PHDR_802_11G_HAS_MODE; phdr.phy_info.info_11g.mode = PHDR_802_11G_MODE_NORMAL; break; case IEEE80211_CHAN_G: phdr.phy = PHDR_802_11_PHY_11G; - phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + if (have_rflags) { + phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + phdr.short_preamble = (rflags & IEEE80211_RADIOTAP_F_SHORTPRE) != 0; + } phdr.phy_info.info_11g.presence_flags = PHDR_802_11G_HAS_MODE; phdr.phy_info.info_11g.mode = PHDR_802_11G_MODE_NORMAL; break; @@ -1215,7 +1235,10 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case IEEE80211_CHAN_108PUREG: phdr.phy = PHDR_802_11_PHY_11G; - phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + if (have_rflags) { + phdr.presence_flags |= PHDR_802_11_HAS_SHORT_PREAMBLE; + phdr.short_preamble = (rflags & IEEE80211_RADIOTAP_F_SHORTPRE) != 0; + } phdr.phy_info.info_11g.presence_flags = PHDR_802_11G_HAS_MODE; phdr.phy_info.info_11g.mode = PHDR_802_11G_MODE_SUPER_G; break; |