diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-11 04:36:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 16:10:34 +0100 |
| commit | b3c3dc54a595c0145c2efa4f68728aa928a9c854 (patch) | |
| tree | fa22c42f09644d499eb533d017377c767ed35ac8 | |
| parent | b6af89be6a2b419720b2be399de75924388777b0 (diff) | |
| download | ffmpeg-b3c3dc54a595c0145c2efa4f68728aa928a9c854.tar.gz | |
avcodec/alac: only set *got_frame_ptr when all channels have been decoded
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f8b64436530_7895_quicktime_newcodec_applelosslessaudiocodec.m4a
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e11983bda073f8c63f60509ee753da9fba20ed10)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/alac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 3f37f61883..1929839e70 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -490,7 +490,8 @@ static int alac_decode_frame(AVCodecContext *avctx, void *data, avpkt->size * 8 - get_bits_count(&alac->gb)); } - *got_frame_ptr = 1; + if (alac->channels == ch) + *got_frame_ptr = 1; return avpkt->size; } |