diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-03-26 19:09:05 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-03-26 19:09:05 +0000 |
| commit | f5c7049c2eecc0059fcf3d5f11a27ce2b9067b12 (patch) | |
| tree | 685dfae236a7b1dc985d94dd6bcf28dab756e4ac /epan/dissectors/packet-gsm_a.c | |
| parent | 9fe9c6826fc3b55ed5bebb90188c0186dd78abd7 (diff) | |
Fix a bug reported by Soi Hon Lo octet 6x and 7 not read from tvb.
svn path=/trunk/; revision=13922
Diffstat (limited to 'epan/dissectors/packet-gsm_a.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_a.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c index afc1a435c0..277ba155c2 100644 --- a/epan/dissectors/packet-gsm_a.c +++ b/epan/dissectors/packet-gsm_a.c @@ -4587,6 +4587,8 @@ de_bearer_cap(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar subtree = proto_item_add_subtree(item, ett_bc_oct_5b); + oct = tvb_get_guint8(tvb, curr_offset); + extended = (oct & 0x80) ? FALSE : TRUE; other_decode_bitfield_value(a_bigbuf, oct, 0x80, 8); @@ -4661,6 +4663,8 @@ bc_octet_6: subtree = proto_item_add_subtree(item, ett_bc_oct_6); + oct = tvb_get_guint8(tvb, curr_offset); + extended = (oct & 0x80) ? FALSE : TRUE; other_decode_bitfield_value(a_bigbuf, oct, 0x80, 8); @@ -4706,6 +4710,8 @@ bc_octet_6: subtree = proto_item_add_subtree(item, ett_bc_oct_6a); + oct = tvb_get_guint8(tvb, curr_offset); + extended = (oct & 0x80) ? FALSE : TRUE; other_decode_bitfield_value(a_bigbuf, oct, 0x80, 8); @@ -4772,6 +4778,8 @@ bc_octet_6: subtree = proto_item_add_subtree(item, ett_bc_oct_6b); + oct = tvb_get_guint8(tvb, curr_offset); + extended = (oct & 0x80) ? FALSE : TRUE; other_decode_bitfield_value(a_bigbuf, oct, 0x80, 8); @@ -4845,6 +4853,8 @@ bc_octet_6: subtree = proto_item_add_subtree(item, ett_bc_oct_6c); + oct = tvb_get_guint8(tvb, curr_offset); + extended = (oct & 0x80) ? FALSE : TRUE; other_decode_bitfield_value(a_bigbuf, oct, 0x80, 8); @@ -4909,6 +4919,8 @@ bc_octet_6: subtree = proto_item_add_subtree(item, ett_bc_oct_6d); + oct = tvb_get_guint8(tvb, curr_offset); + extended = (oct & 0x80) ? FALSE : TRUE; other_decode_bitfield_value(a_bigbuf, oct, 0x80, 8); @@ -4975,6 +4987,8 @@ bc_octet_6: subtree = proto_item_add_subtree(item, ett_bc_oct_6e); + oct = tvb_get_guint8(tvb, curr_offset); + extended = (oct & 0x80) ? FALSE : TRUE; other_decode_bitfield_value(a_bigbuf, oct, 0x80, 8); @@ -5050,6 +5064,8 @@ bc_octet_6: subtree = proto_item_add_subtree(item, ett_bc_oct_6f); + oct = tvb_get_guint8(tvb, curr_offset); + extended = (oct & 0x80) ? FALSE : TRUE; other_decode_bitfield_value(a_bigbuf, oct, 0x80, 8); @@ -5130,6 +5146,8 @@ bc_octet_6: subtree = proto_item_add_subtree(item, ett_bc_oct_6g); + oct = tvb_get_guint8(tvb, curr_offset); + extended = (oct & 0x80) ? FALSE : TRUE; other_decode_bitfield_value(a_bigbuf, oct, 0x80, 8); @@ -5218,6 +5236,8 @@ bc_octet_7: extended = (oct & 0x80) ? FALSE : TRUE; + oct = tvb_get_guint8(tvb, curr_offset); + other_decode_bitfield_value(a_bigbuf, oct, 0x80, 8); proto_tree_add_text(subtree, tvb, curr_offset, 1, |