openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-30 14:40:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avcodec/apedec: Fix 2 signed overflows

Browse Source 
Fixes: left shift of 1073741824 by 1 places cannot be represented in type 'int'
Fixes: signed integer overflow: 2049431315 + 262759074 cannot be represented in type 'int'
Fixes: 16012/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5719016003338240

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-08-04 09:46:34 +02:00
parent 99a172f3f4
commit 392c028cd2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/apedec.c
View File

@ -589,7 +589,7 @@ static void decode_array_0000(APEContext *ctx, GetBitContext *gb,
int32_t *out, APERice *rice, int blockstodecode) int32_t *out, APERice *rice, int blockstodecode)
{ {
int i; int i;
int ksummax, ksummin; unsigned ksummax, ksummin;
rice->ksum = 0; rice->ksum = 0;
for (i = 0; i < FFMIN(blockstodecode, 5); i++) { for (i = 0; i < FFMIN(blockstodecode, 5); i++) {
@ -836,7 +836,7 @@ static av_always_inline int filter_fast_3320(APEPredictor *p,
else else
p->coeffsA[filter][0]--; p->coeffsA[filter][0]--;
p->filterA[filter] += p->lastA[filter]; p->filterA[filter] += (unsigned)p->lastA[filter];
return p->filterA[filter]; return p->filterA[filter];
} }