Skip to content
Snippets Groups Projects
Commit e245d4f4 authored by Luca Barbato's avatar Luca Barbato
Browse files

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: default avatarLuca Barbato <lu_zero@gentoo.org>
parent 3df77b58
Branches
Tags
No related merge requests found
...@@ -1297,6 +1297,9 @@ static int set_channel_layout(AVCodecContext *avctx, int channels, int num_core_ ...@@ -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]; 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 && if (channels > !!s->lfe &&
s->channel_order_tab[channels - 1 - !!s->lfe] < 0) s->channel_order_tab[channels - 1 - !!s->lfe] < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment