osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
moraney.jalil 2014-07-24 22:34:29 +03:00 committed by Evan Huus
parent ebe713223e
commit 0501465a3a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-ieee80211.c
View File

@ -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;
}