summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-06-14 16:37:32 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-06-15 21:52:33 +0200
commit575d8ca0260fabac29e5b3541154633569ce2b5d (patch)
treeb962aa6d97087e9fac907d0e0aec985c7259022a
parentaa41d322be71106ce147445f2b42bb763f1eff86 (diff)
downloadffmpeg-streaming-575d8ca0260fabac29e5b3541154633569ce2b5d.zip
ffmpeg-streaming-575d8ca0260fabac29e5b3541154633569ce2b5d.tar.gz
avcodec/dirac_dwt_template: Fix undefined behavior in interleave()
Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 8697/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5197148130902016 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/dirac_dwt_template.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dirac_dwt_template.c b/libavcodec/dirac_dwt_template.c
index 8c25c1f..528fc7e 100644
--- a/libavcodec/dirac_dwt_template.c
+++ b/libavcodec/dirac_dwt_template.c
@@ -57,8 +57,8 @@ static av_always_inline void RENAME(interleave)(TYPE *dst, TYPE *src0, TYPE *src
{
int i;
for (i = 0; i < w2; i++) {
- dst[2*i ] = (src0[i] + add) >> shift;
- dst[2*i+1] = (src1[i] + add) >> shift;
+ dst[2*i ] = (src0[i] + (unsigned)add) >> shift;
+ dst[2*i+1] = (src1[i] + (unsigned)add) >> shift;
}
}
OpenPOWER on IntegriCloud