[FFmpeg-cvslog] avcodec/atrac9dec: Set channels

Michael Niedermayer git at videolan.org
Tue Oct 22 00:16:15 EEST 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Oct 21 00:22:46 2019 +0200| [e85eb7cb04cefa37c7f8e78aac381aa8377dea0f] | committer: Michael Niedermayer

avcodec/atrac9dec: Set channels

Fixes: null pointer dereference
Fixes: 18341/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ATRAC9_fuzzer-5681203490848768

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Lynne <dev at lynne.ee>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e85eb7cb04cefa37c7f8e78aac381aa8377dea0f
---

 libavcodec/atrac9dec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c
index 46e60ca998..b0f659d118 100644
--- a/libavcodec/atrac9dec.c
+++ b/libavcodec/atrac9dec.c
@@ -873,6 +873,7 @@ static av_cold int atrac9_decode_init(AVCodecContext *avctx)
     s->block_config = &at9_block_layout[block_config_idx];
 
     avctx->channel_layout = s->block_config->channel_layout;
+    avctx->channels       = av_get_channel_layout_nb_channels(avctx->channel_layout);
     avctx->sample_fmt     = AV_SAMPLE_FMT_FLTP;
 
     if (get_bits1(&gb)) {



More information about the ffmpeg-cvslog mailing list