diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-23 00:17:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-23 00:56:18 +0100 |
| commit | 866c44d4b0f90d448cffbe9d4422a2dec7df698b (patch) | |
| tree | 2536a7fed1a9d3cb17a597724abdcba31f228d87 /libavcodec/wavpack.c | |
| parent | 911676c64374af3959ef01609047503a42d5bf87 (diff) | |
| download | ffmpeg-866c44d4b0f90d448cffbe9d4422a2dec7df698b.tar.gz | |
avcodec/wavpack: clear remainder of data in case of error in wv_unpack_mono/stereo()
Fixes use of uninitialized data
Fixes: msan_uninit-mem_7fd85b654950_4005_because.wv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wavpack.c')
| -rw-r--r-- | libavcodec/wavpack.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 6036a5c7dd..e1abe8d512 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -487,6 +487,13 @@ static inline int wv_unpack_stereo(WavpackFrameContext *s, GetBitContext *gb, } while (!last && count < s->samples); wv_reset_saved_context(s); + + if (last && count < s->samples) { + int size = av_get_bytes_per_sample(type); + memset(dst_l + count*size, 0, (s->samples-count)*size); + memset(dst_r + count*size, 0, (s->samples-count)*size); + } + if ((s->avctx->err_recognition & AV_EF_CRCCHECK) && wv_check_crc(s, crc, crc_extra_bits)) return AVERROR_INVALIDDATA; @@ -548,6 +555,12 @@ static inline int wv_unpack_mono(WavpackFrameContext *s, GetBitContext *gb, } while (!last && count < s->samples); wv_reset_saved_context(s); + + if (last && count < s->samples) { + int size = av_get_bytes_per_sample(type); + memset(dst + count*size, 0, (s->samples-count)*size); + } + if (s->avctx->err_recognition & AV_EF_CRCCHECK) { int ret = wv_check_crc(s, crc, crc_extra_bits); if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE) |