Browse Source

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: Luca Barbato <lu_zero@gentoo.org>
tags/n4.0
Luca Barbato 8 years ago
parent
commit
e245d4f45c
1 changed files with 3 additions and 0 deletions
  1. +3
    -0
      libavcodec/dcadec.c

+ 3
- 0
libavcodec/dcadec.c View File

@@ -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;


Loading…
Cancel
Save