diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-17 15:33:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-17 15:33:59 +0100 |
| commit | 7d593495e42e92693cc8f3ce9b42cf3edcea377a (patch) | |
| tree | ed11b564b0d58dfd8f70f58d890d9af23b33a86e /libavcodec/dcadec.c | |
| parent | 973684a4fba91b9c188b3a19d22e59ffaad79be8 (diff) | |
| download | ffmpeg-streaming-7d593495e42e92693cc8f3ce9b42cf3edcea377a.zip ffmpeg-streaming-7d593495e42e92693cc8f3ce9b42cf3edcea377a.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>
Diffstat (limited to 'libavcodec/dcadec.c')
| -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 a36f69b..40d8e9e 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -2360,6 +2360,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; |
