diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-02 19:10:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-02 22:07:09 +0100 |
| commit | 2e59ffbb7964214e192a9f77c4445ff29c6510d7 (patch) | |
| tree | 0c24a49173a1b458b0f202121c86ba32126caaca /libavcodec/mace.c | |
| parent | c925e960e83dffdfdbb9598bb1a6ba475cb4520d (diff) | |
| download | ffmpeg-2e59ffbb7964214e192a9f77c4445ff29c6510d7.tar.gz | |
avcodec/mace: check buffer size
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9d2775e090_8782_surge-2-8-MAC3.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mace.c')
| -rw-r--r-- | libavcodec/mace.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/mace.c b/libavcodec/mace.c index fbd932e203..6eaa296688 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -244,6 +244,13 @@ static int mace_decode_frame(AVCodecContext *avctx, void *data, int i, j, k, l, ret; int is_mace3 = (avctx->codec_id == AV_CODEC_ID_MACE3); + if (buf_size % (avctx->channels << is_mace3)) { + av_log(avctx, AV_LOG_ERROR, "buffer size %d is odd\n", buf_size); + buf_size -= buf_size % (avctx->channels << is_mace3); + if (!buf_size) + return AVERROR_INVALIDDATA; + } + /* get output buffer */ frame->nb_samples = 3 * (buf_size << (1 - is_mace3)) / avctx->channels; if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) |