aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-capwap.c
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2016-02-24 12:45:57 +0100
committerMichael Mann <mmann78@netscape.net>2016-03-31 22:01:12 +0000
commite2745d741ec11f395d41c0aafa24df9dec136399 (patch)
tree1cab008766341d850682f8bc9ad8a3e4e8707167 /epan/dissectors/packet-capwap.c
parentac51b006795dfc03974a56cfd7e7e09accdc6ae5 (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-capwap.c')
-rw-r--r--epan/dissectors/packet-capwap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index 565d800c20..0eed93d43f 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -2722,7 +2722,7 @@ hf_capwap_msg_element_type_ieee80211_ie_flags, ett_capwap_ieee80211_ie_flags, ie
offset += 1;
while (offset < offset_end) {
- offset += add_tagged_field(pinfo, sub_msg_element_type_tree, tvb, offset, 0);
+ offset += add_tagged_field(pinfo, sub_msg_element_type_tree, tvb, offset, 0, NULL, 0);
}
break;