diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 15:46:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 04:43:41 +0200 |
| commit | 0cb600b7bfb7ea1cc333cabce7d5c02a68bb15cb (patch) | |
| tree | bd2d9ee3bf7d5260b358c344b39570617f84a847 | |
| parent | c5c141bc699f9b6f2e5613bc826b0943b70e1011 (diff) | |
| download | ffmpeg-0cb600b7bfb7ea1cc333cabce7d5c02a68bb15cb.tar.gz | |
avcodec/alac: Clear pointers in allocate_buffers()
Fixes: 06a4edb39ad8a9883175f9bd428334a2_signal_sigsegv_7ffff713351a_706_mov__alac__ALAC_6ch.mov
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f7068bf277a37479aecde2832208d820682b35e6)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/alac.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index ada7c73c55..d7aa7fb429 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -533,6 +533,12 @@ static int allocate_buffers(ALACContext *alac) int ch; int buf_size = alac->max_samples_per_frame * sizeof(int32_t); + for (ch = 0; ch < 2; ch++) { + alac->predict_error_buffer[ch] = NULL; + alac->output_samples_buffer[ch] = NULL; + alac->extra_bits_buffer[ch] = NULL; + } + for (ch = 0; ch < FFMIN(alac->channels, 2); ch++) { FF_ALLOC_OR_GOTO(alac->avctx, alac->predict_error_buffer[ch], buf_size, buf_alloc_fail); |