diff options
| author | moraney.jalil <moraney.jalil@outlook.com> | 2014-07-24 22:34:29 +0300 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-07-25 02:59:43 +0000 |
| commit | 0501465a3acb2abc108177ea5149ec8de4a05210 (patch) | |
| tree | 47dfcf580ac9df5c441d75809c0374c27b9d96a5 /epan | |
| parent | ebe713223ee53e9655fe884b720b63f9f2b58456 (diff) | |
Fixing a bug in add_ff_action_public_fields(), by removing the start argument and defining it inside the function.
Change-Id: I6205384b3bcf38128912baf413b4455357d25347
Reviewed-on: https://code.wireshark.org/review/3184
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 8ec779aca4..a24f53b591 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -7650,7 +7650,7 @@ add_ff_action_block_ack(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int } static guint -add_ff_action_public_fields(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset, guint8 code, guint start) +add_ff_action_public_fields(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset, guint8 code) { guint32 oui; guint8 subtype; @@ -7659,6 +7659,8 @@ add_ff_action_public_fields(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, guint8 frag; gboolean more; + guint start = offset; + switch (code) { case PA_EXT_CHANNEL_SWITCH_ANNOUNCEMENT: offset += add_ff_extended_channel_switch_announcement(tree, tvb, pinfo, offset); @@ -7736,7 +7738,7 @@ add_ff_action_public(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int of offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_CATEGORY_CODE); code = tvb_get_guint8(tvb, offset); offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_PA_ACTION_CODE); - offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code, start); + offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code); return offset - start; } @@ -7748,7 +7750,7 @@ add_ff_action_protected_public(proto_tree *tree, tvbuff_t *tvb, packet_info *pin offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_CATEGORY_CODE); code = tvb_get_guint8(tvb, offset); offset += add_fixed_field(tree, tvb, pinfo, offset, FIELD_PPA_ACTION_CODE); - offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code, start); + offset += add_ff_action_public_fields(tree, tvb, pinfo, offset, code); return offset - start; } |