diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-10-02 09:55:52 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-10-02 08:57:55 +0000 |
| commit | 1b8ccdc45d1c6e68291802021b4648594d5fcf81 (patch) | |
| tree | b8cc65698bc39dad54798ab096d65623b43bc523 /epan/dissectors/packet-gsm_osmux.c | |
| parent | 02640154045c35618ee155fc28e2495c87b4b296 (diff) | |
gsm_osmux: fix implicit conversion shortens 64-bit value into a 32-bit value (with macOS buildbot)
Change-Id: Idd919b20f9909fe3f85b6e1694738a8561f4d97f
Reviewed-on: https://code.wireshark.org/review/18014
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-gsm_osmux.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_osmux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-gsm_osmux.c b/epan/dissectors/packet-gsm_osmux.c index e452405352..c15734f017 100644 --- a/epan/dissectors/packet-gsm_osmux.c +++ b/epan/dissectors/packet-gsm_osmux.c @@ -135,8 +135,8 @@ dissect_osmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U proto_tree_add_bitmask_ret_uint64(osmux_tree, tvb, offset, hf_osmux_amr_ft_cmr, ett_osmux_amr_ft_cmr, amr_ft_cmr_fields, ENC_BIG_ENDIAN, &amr_ft_cmr); offset++; - osmuxh->amr_ft = (amr_ft_cmr & 0xf0) >> 4; - osmuxh->amr_cmr = amr_ft_cmr & 0x0f; + osmuxh->amr_ft = (guint32)(amr_ft_cmr & 0xf0) >> 4; + osmuxh->amr_cmr = (guint32)amr_ft_cmr & 0x0f; proto_tree_add_item(osmux_tree, hf_osmux_amr_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA); |