Commit e245d4f4 authored by Luca Barbato's avatar Luca Barbato

dca: Validate the channel map

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: libav-stable@libav.org
Signed-off-by: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent 3df77b58
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment