diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-23 18:09:58 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-23 18:11:35 +0100 |
commit | 99978320c0dcf16c34bdba19ff8f0cd61628cc41 (patch) | |
tree | 13d0b7f2ba181f503bf7e826d1ec81238ff40785 /libavcodec | |
parent | d5128fce38646d3f64c55feda42084888ba0e87e (diff) | |
download | ffmpeg-99978320c0dcf16c34bdba19ff8f0cd61628cc41.tar.gz |
avcodec/apedec: use av_fast_padded_malloc()
Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7fa0d8c8bd58_8417_sh3.ape
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/apedec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 07aff923ba..58072d49ba 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1438,7 +1438,7 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data, } if (s->fileversion < 3950) // previous versions overread two bytes buf_size += 2; - av_fast_malloc(&s->data, &s->data_size, buf_size); + av_fast_padded_malloc(&s->data, &s->data_size, buf_size); if (!s->data) return AVERROR(ENOMEM); s->dsp.bswap_buf((uint32_t*)s->data, (const uint32_t*)buf, buf_size >> 2); |