har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/apedec: Fix integer overflow in intermediate

Browse Source 
Fixes: signed integer overflow: 559334865 * 4 cannot be represented in type 'int'
Fixes: 37929/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-6751932295806976

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 90da43557f7257d72e95504f63ae6504406d6eab)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-09-15 22:00:47 +02:00
parent e2bba86f27
commit b87d26675d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/apedec.c
View File

@ -1309,7 +1309,7 @@ static void do_apply_filter(APEContext *ctx, int version, APEFilter *f,
absres = res < 0 ? -(unsigned)res : res; absres = res < 0 ? -(unsigned)res : res;
if (absres) if (absres)
*f->adaptcoeffs = APESIGN(res) * *f->adaptcoeffs = APESIGN(res) *
(8 << ((absres > f->avg * 3) + (absres > f->avg * 4 / 3))); (8 << ((absres > f->avg * 3) + (absres > (f->avg + f->avg / 3))));
/* equivalent to the following code /* equivalent to the following code
if (absres <= f->avg * 4 / 3) if (absres <= f->avg * 4 / 3)
*f->adaptcoeffs = APESIGN(res) * 8; *f->adaptcoeffs = APESIGN(res) * 8;