aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-09-25 20:51:22 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-31 19:51:55 +0100
commit53f38b7b82a148be529a83203895c57321696912 (patch)
treed740ed930c3020d26108ff0214e8dd1031f714a8
parent447a67589b0e92c4552876989e6545d3d46d0247 (diff)
downloadffmpeg-53f38b7b82a148be529a83203895c57321696912.tar.gz
avcodec/atrac3: Check block_align
Fixes: Infinite loop Fixes: 17620/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC3_fuzzer-5086123012915200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2acbbe262325187d87e8881c2984d203fb54207e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/atrac3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 6cdcdf1964..dc19a3863e 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -964,7 +964,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA;
}
- if (avctx->block_align >= UINT_MAX / 2)
+ if (avctx->block_align >= UINT_MAX / 2 || avctx->block_align <= 0)
return AVERROR(EINVAL);
q->decoded_bytes_buffer = av_mallocz(FFALIGN(avctx->block_align, 4) +