Having a mismatch between the number of channels in the stream and those in the channel map will lead to a segfault or worse.
Bug-Id: 1016 CC: [email protected] --- Description updated. libavcodec/dcadec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index cd4432368c..af26dceafd 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1297,6 +1297,9 @@ static int set_channel_layout(AVCodecContext *avctx, int channels, int num_core_ s->channel_order_tab = ff_dca_channel_reorder_nolfe[s->amode]; } + if (channels < ff_dca_channels[s->amode]) + return AVERROR_INVALIDDATA; + if (channels > !!s->lfe && s->channel_order_tab[channels - 1 - !!s->lfe] < 0) return AVERROR_INVALIDDATA; -- 2.11.1 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
