diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 03:29:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:40:35 +0100 |
| commit | 2fcfcd5c8787fd05bbf80d97543caa7713afc927 (patch) | |
| tree | 5c8212fe1d653ac84a31acf7b15db4ad7d4cc89b | |
| parent | 46dfd59ae1997d0bc6b38dcf19b427b6484f20c0 (diff) | |
| download | ffmpeg-2fcfcd5c8787fd05bbf80d97543caa7713afc927.tar.gz | |
avcodec/flacdec: Call ff_flacdsp_init() unconditionally
Fixes out of array access
Fixes: signal_sigsegv_324b135_3398_cov_246853371_short.flac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e5c01ccdf5a9a330d4c51a9b9ea721fd8f1fb70b)
Conflicts:
libavcodec/flacdec.c
| -rw-r--r-- | libavcodec/flacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 9d5ecd04cf..cfde037587 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -467,10 +467,10 @@ static int decode_frame(FLACContext *s) ret = allocate_buffers(s); if (ret < 0) return ret; - ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, s->bps); s->got_streaminfo = 1; dump_headers(s->avctx, (FLACStreaminfo *)s); } + ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, s->bps); // dump_headers(s->avctx, (FLACStreaminfo *)s); |