RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/apedec: make left/right unsigned to avoid undefined behavior 

Fixes: signed integer overflow: 755176387 + 1515360583 cannot be represented in type 'int'
Fixes: 15506/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5706859232624640

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-07-02 12:13:19 +02:00
parent 267eb2ab7f
commit bf778af149
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

@ -1376,7 +1376,7 @@ static void ape_unpack_mono(APEContext *ctx, int count)
static void ape_unpack_stereo(APEContext *ctx, int count) static void ape_unpack_stereo(APEContext *ctx, int count)
{ {
int32_t left, right; unsigned left, right;
int32_t *decoded0 = ctx->decoded[0]; int32_t *decoded0 = ctx->decoded[0];
int32_t *decoded1 = ctx->decoded[1]; int32_t *decoded1 = ctx->decoded[1];
@ -1393,7 +1393,7 @@ static void ape_unpack_stereo(APEContext *ctx, int count)
/* Decorrelate and scale to output depth */ /* Decorrelate and scale to output depth */
while (count--) { while (count--) {
left = *decoded1 - (*decoded0 / 2); left = *decoded1 - (unsigned)(*decoded0 / 2);
right = left + *decoded0; right = left + *decoded0;
*(decoded0++) = left; *(decoded0++) = left;