diff mbox

[FFmpeg-devel,3/4] avcodec/atrac9dec: Set channels

Message ID 20191020232059.19471-3-michael@niedermayer.cc
State Accepted
Commit e85eb7cb04cefa37c7f8e78aac381aa8377dea0f
Headers show

Commit Message

Michael Niedermayer Oct. 20, 2019, 11:20 p.m. UTC 
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
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/atrac9dec.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Lynne Oct. 21, 2019, 12:14 p.m. UTC | #1 
Oct 21, 2019, 00:20 by michael@niedermayer.cc:
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
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/atrac9dec.c | 1 +
 1 file changed, 1 insertion(+)

lgtm
Michael Niedermayer Oct. 21, 2019, 8:15 p.m. UTC | #2 
On Mon, Oct 21, 2019 at 02:14:49PM +0200, Lynne wrote:
> Oct 21, 2019, 00:20 by michael@niedermayer.cc:
> 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
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/atrac9dec.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> lgtm

will apply

thanks

[...]
diff mbox

Patch

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)) {