From f41e37b84f3d57c29d4a2a21f9337159135b981d Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Thu, 14 Jul 2016 01:26:51 +0100 Subject: [PATCH] dirac_vlc: prevent shifting a 0 by 64 bits when zeroing residue Adding a check for bits == 0 would still make Coverity misdetect this, so just revert to the normal way of setting the residue to 0. Signed-off-by: Rostislav Pehlivanov --- libavcodec/dirac_vlc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dirac_vlc.c b/libavcodec/dirac_vlc.c index d874278aa6..336d22a182 100644 --- a/libavcodec/dirac_vlc.c +++ b/libavcodec/dirac_vlc.c @@ -65,7 +65,7 @@ int ff_dirac_golomb_read_32bit(DiracGolombLUT *lut_ctx, const uint8_t *buf, coeff |= (res >> (RSIZE_BITS - 2*i - 2)) & 1; } dst[c_idx++] = l->sign * (coeff - 1); - SET_RESIDUE(res, 0, 0); + res_bits = res = 0; } memcpy(&dst[c_idx], l->ready, LUT_BITS*sizeof(int32_t)); @@ -104,7 +104,7 @@ int ff_dirac_golomb_read_16bit(DiracGolombLUT *lut_ctx, const uint8_t *buf, coeff |= (res >> (RSIZE_BITS - 2*i - 2)) & 1; } dst[c_idx++] = l->sign * (coeff - 1); - SET_RESIDUE(res, 0, 0); + res_bits = res = 0; } for (i = 0; i < LUT_BITS; i++)