diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-19 01:03:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-01-06 11:30:42 +0100 |
| commit | 14616c63df76ae0d8a97491d4a1be4eb0954e947 (patch) | |
| tree | d0dfd46398677575e5b97410178849a6ae39f527 /libavcodec/atrac9dec.c | |
| parent | 95e414dc5dd3c1500bd531eaa886f27cd84640f3 (diff) | |
| download | ffmpeg-14616c63df76ae0d8a97491d4a1be4eb0954e947.tar.gz | |
avcodec/atrac9dec: Check block_align
Fixes: Infinite loop
Fixes: 16260/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC9_fuzzer-5676365617037312
Fixes: 16260/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC9_fuzzer-5768093879500800
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 dead949a1fbf019647f5c8ea797d1c7be6615639)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/atrac9dec.c')
| -rw-r--r-- | libavcodec/atrac9dec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index 87c9c51cd8..b42bb07f23 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -842,6 +842,11 @@ static av_cold int atrac9_decode_init(AVCodecContext *avctx) av_lfg_init(&s->lfg, 0xFBADF00D); + if (avctx->block_align <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid block align\n"); + return AVERROR_INVALIDDATA; + } + if (avctx->extradata_size != 12) { av_log(avctx, AV_LOG_ERROR, "Invalid extradata length!\n"); return AVERROR_INVALIDDATA; |