diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-05-15 16:11:22 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-05-15 23:12:45 +0000 |
| commit | 4988cca14da57b64a6432d237d3cc208e39e71bb (patch) | |
| tree | fda6058e8da63b948852d177be1bc1aa0d73ef2b /epan/dissectors/packet-ieee80211-radio.c | |
| parent | b960f5f4c2782c425596f91ad6f2002529578dcc (diff) | |
Add a null pointer check.
While we're at it, fix a typo in a comment.
Bug: 13711
Change-Id: Ie1e4aa9243ccb10621bf181b232e177c2a7f867c
Reviewed-on: https://code.wireshark.org/review/21676
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ieee80211-radio.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211-radio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c index 2b78c79934..ca91f5abaa 100644 --- a/epan/dissectors/packet-ieee80211-radio.c +++ b/epan/dissectors/packet-ieee80211-radio.c @@ -541,7 +541,8 @@ dissect_wlan_radio_phdr (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, /* go back to the first frame in the aggregate, * and mark it as part of this aggregate */ - previous_frame.radio_info->aggregate = current_aggregate; + if (previous_frame.radio_info != NULL) + previous_frame.radio_info->aggregate = current_aggregate; } wlan_radio_info->aggregate = current_aggregate; @@ -569,7 +570,7 @@ dissect_wlan_radio_phdr (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, previous_frame.tsf_timestamp = phdr->tsf_timestamp; previous_frame.phy = phdr->phy; } else { - /* this frame has already been seen, so get it's info structure */ + /* this frame has already been seen, so get its info structure */ wlan_radio_info = (struct wlan_radio *) p_get_proto_data(wmem_file_scope(), pinfo, proto_wlan_radio, 0); if (wlan_radio_info->aggregate) { |