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-bacapp.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-bacapp.c')
| -rw-r--r-- | epan/dissectors/packet-bacapp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 133783b65b..f2ae18d8e3 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -13520,15 +13520,15 @@ fStartConfirmed(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *bacapp_tree, guint extra = 2; bacapp_seq = 0; - tmp = (gint) tvb_get_guint8(tvb, offset); + tmp = tvb_get_gint8(tvb, offset); bacapp_flags = tmp & 0x0f; if (ack == 0) { extra = 3; } - *svc = (gint) tvb_get_guint8(tvb, offset+extra); + *svc = tvb_get_gint8(tvb, offset+extra); if (bacapp_flags & 0x08) - *svc = (gint) tvb_get_guint8(tvb, offset+extra+2); + *svc = tvb_get_gint8(tvb, offset+extra+2); proto_tree_add_item(bacapp_tree, hf_bacapp_type, tvb, offset, 1, ENC_BIG_ENDIAN); tc = proto_tree_add_item(bacapp_tree, hf_bacapp_pduflags, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -13896,7 +13896,7 @@ do_the_dissection(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 flag, bacapp_type; guint offset = 0; - flag = (gint) tvb_get_guint8(tvb, 0); + flag = tvb_get_gint8(tvb, 0); bacapp_type = (flag >> 4) & 0x0f; if (tvb == NULL) { |