diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-04-09 23:06:47 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-04-10 14:55:45 +0000 |
| commit | c7970d9356a494d847101c2bd92e4ca97a7d3d58 (patch) | |
| tree | e894b469ecc2c26563fbce3a9512af9bad66c594 /epan/dissectors/packet-ieee80211.c | |
| parent | 2cb93e2121eea20c1e443558d7175f1cab8e1f70 (diff) | |
Add, and use, "fetch signed value" for lengths < 40 bits.
Add 8-bit, 16-bit, 24-bit, and 32-bit "fetch signed value" routines, and
use them rather than casting the result of the 8/16/24/32-bit "fetch
unsigned value" routines to a signed type (which, BTW, isn't sufficient
for 24-bit values, so this appears to fix a bug
in epan/dissectors/packet-zbee-zcl.c).
Use numbers rather than sizeof()s in various tvb_get_ routines.
Change-Id: I0e48a57fac9f70fe42de815c3fa915f1592548bd
Reviewed-on: https://code.wireshark.org/review/26844
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 1a1f53add8..d947764de5 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -6109,7 +6109,7 @@ add_mimo_compressed_beamforming_feedback_report(proto_tree *tree, tvbuff_t *tvb, gint8 snr; char edge_sign; - snr = (gint8) tvb_get_guint8(tvb, offset); + snr = tvb_get_gint8(tvb, offset); switch(snr) { case -128: @@ -10347,7 +10347,7 @@ add_ff_vht_compressed_beamforming_report(proto_tree *tree, tvbuff_t *tvb, packet gint8 snr; char edge_sign; - snr = (gint8) tvb_get_guint8(tvb, offset); + snr = tvb_get_gint8(tvb, offset); switch(snr) { case -128: @@ -16462,11 +16462,11 @@ ieee80211_tag_power_capability(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } proto_tree_add_item(tree, hf_ieee80211_tag_power_capability_min, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_item_append_text(field_data->item_tag, " Min: %d", (gint8)tvb_get_guint8(tvb, offset)); + proto_item_append_text(field_data->item_tag, " Min: %d", tvb_get_gint8(tvb, offset)); offset += 1; proto_tree_add_item(tree, hf_ieee80211_tag_power_capability_max, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_item_append_text(field_data->item_tag, ", Max: %d", (gint8)tvb_get_guint8(tvb, offset)); + proto_item_append_text(field_data->item_tag, ", Max: %d", tvb_get_gint8(tvb, offset)); return tvb_captured_length(tvb); } |