diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-02-18 17:29:52 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-02-18 23:27:02 +0000 |
| commit | 7e70311a4ff6e0b4cc08a481fdf0f1cc422b13cd (patch) | |
| tree | 525b9a3277519ba90f7c31a6a2cef6bd96d11727 | |
| parent | f7724c319e97e03eac547db410c6971fbb61d68d (diff) | |
| download | wireshark-7e70311a4ff6e0b4cc08a481fdf0f1cc422b13cd.tar.gz | |
Fix ieee80211_tag_ssid
Was still using tag type + length when doing offset calculations.
Change-Id: I778f56f28fa1ccec57c5192df4f8e4aa99e45e45
Reviewed-on: https://code.wireshark.org/review/20174
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 62e07a10a1..79f20cae43 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -13525,11 +13525,11 @@ ieee80211_tag_ssid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da * string value, so we can do something other than run it through * format_text(), which won't handle UTF-8. */ - ssid = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, ssid_len, ENC_ASCII); + ssid = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, ssid_len, ENC_ASCII); if (ssid_len == (gint)tag_len) { AirPDcapSetLastSSID(&airpdcap_ctx, (CHAR *) ssid, ssid_len); } - proto_tree_add_item(tree, hf_ieee80211_tag_ssid, tvb, offset + 2, tag_len, + proto_tree_add_item(tree, hf_ieee80211_tag_ssid, tvb, offset, tag_len, ENC_ASCII|ENC_NA); if (ssid_len > 0) { @@ -13549,7 +13549,7 @@ ieee80211_tag_ssid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da beacon_padding += 1; /* padding bug */ - return offset + 2 + tag_len; + return offset + tag_len; } static int |