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

avcodec/wmaprodec: Check if the channel sum of all internal contexts match the external 

Fixes: NULL pointer dereference
Fixes: 18689/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XMA1_fuzzer-5715114640015360

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-11-12 18:39:08 +01:00
parent 8bcb5fbab5
commit 090ac57997
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/wmaprodec.c
View File

@ -1930,6 +1930,8 @@ static av_cold int xma_decode_init(AVCodecContext *avctx)
s->start_channel[i] = start_channels; s->start_channel[i] = start_channels;
start_channels += s->xma[i].nb_channels; start_channels += s->xma[i].nb_channels;
} }
if (start_channels != avctx->channels)
return AVERROR_INVALIDDATA;
return ret; return ret;
} }