diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-17 15:33:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-20 03:27:17 +0100 |
| commit | 133dc77da96fe8c4ed042d7a2cce835ef5aba6c3 (patch) | |
| tree | 61f2485ae3c60e756028ca8e241f5f58396cc511 | |
| parent | 9ce4686bfef84845eb285e5732d3fa182e056391 (diff) | |
| download | ffmpeg-133dc77da96fe8c4ed042d7a2cce835ef5aba6c3.tar.gz | |
avcodec/dcadec: Check that the added xch channel isnt already there
Fixes null pointer dereference
Fixes: signal_sigsegv_369609d_623_cov_2008234281_ES_6.1_16bit.dts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7d593495e42e92693cc8f3ce9b42cf3edcea377a)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dcadec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 4392f032f9..c02d7a7f4a 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -2349,6 +2349,10 @@ FF_ENABLE_DEPRECATION_WARNINGS #else if (s->xch_present && !s->xch_disable) { #endif + if (avctx->channel_layout & AV_CH_BACK_CENTER) { + avpriv_request_sample(avctx, "XCh with Back center channel"); + return AVERROR_INVALIDDATA; + } avctx->channel_layout |= AV_CH_BACK_CENTER; if (s->lfe) { avctx->channel_layout |= AV_CH_LOW_FREQUENCY; |