diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-02-24 12:45:57 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-31 22:01:12 +0000 |
| commit | e2745d741ec11f395d41c0aafa24df9dec136399 (patch) | |
| tree | 1cab008766341d850682f8bc9ad8a3e4e8707167 /epan/dissectors/packet-ieee80211.h | |
| parent | ac51b006795dfc03974a56cfd7e7e09accdc6ae5 (diff) | |
ieee80211: fix deep recursion
Restrict the list of possible (sub)elements to avoid deep recursion.
Bug: 11824
Bug: 12187
Change-Id: I12deb9956c6ba9b6113cf45da4ee919e33ff8567
Reviewed-on: https://code.wireshark.org/review/14114
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ieee80211.h')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee80211.h b/epan/dissectors/packet-ieee80211.h index d441f52a9d..4e4acb43f2 100644 --- a/epan/dissectors/packet-ieee80211.h +++ b/epan/dissectors/packet-ieee80211.h @@ -50,7 +50,9 @@ void dissect_wifi_display_ie(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint size); int add_tagged_field(packet_info *pinfo, proto_tree *tree, - tvbuff_t *tvb, int offset, int ftype); + tvbuff_t *tvb, int offset, int ftype, + const guint8 *valid_element_ids, + guint valid_element_ids_count); #define MAX_SSID_LEN 32 #define MAX_PROTECT_LEN 10 |