diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2014-03-21 22:47:20 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-03-22 07:55:56 +0000 |
| commit | 296bc0b2a9374bb4102fcec4fd0106421aa5e34a (patch) | |
| tree | 39b1d7e126504e3977384df9f17b575e69971c94 /epan/dissectors/packet-ieee80211.c | |
| parent | da83eadf5ee49d43534c970ae8d6fe3080ea070d (diff) | |
Fix Bug 9909 Buildbot crash correctly
Fixed a null de-reference in packet-ieee80211.c caused by change-id
I742726027bcab7d25ca4a9ce3a406518db6d272f, commit g4b8b83407ac744d114462235a8bcca0d480954c7.
See Bug 9909 for details.
Change-Id: I7189476faee3ae6ab34fb52c1564ac668496679a
Reviewed-on: https://code.wireshark.org/review/780
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 3aff5dc74a..7b1e779c07 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -12789,7 +12789,7 @@ dissect_neighbor_report(tvbuff_t *tvb, packet_info *pinfo, return offset; } -// tag_offset = offset; + /* tag_offset = offset; */ proto_tree_add_item(tree, hf_ieee80211_tag_neighbor_report_bssid, tvb, offset, 6, ENC_NA); offset += 6; @@ -13255,11 +13255,7 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset gboolean *p_isDMG = ((gboolean*)(p_get_proto_data(wmem_file_scope(), pinfo, proto_wlan, IS_DMG_KEY))); - if (!p_isDMG) { - DISSECTOR_ASSERT_NOT_REACHED(); - } - - isDMG = *p_isDMG; + isDMG = p_isDMG ? *p_isDMG : FALSE; tag_no = tvb_get_guint8(tvb, offset); tag_len = tvb_get_guint8(tvb, offset + 1); tag_end = offset + 2 + tag_len; |