[FFmpeg-cvslog] dcadec: check layout & channel count for consistency.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 13 17:33:03 2012 +0100| [a0212ecf8452e9861286639543a772dc94f3ad07] | committer: Michael Niedermayer

dcadec: check layout & channel count for consistency.

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0212ecf8452e9861286639543a772dc94f3ad07
---

 libavcodec/dcadec.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index c21a97b..dabc5a4 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -2249,6 +2249,11 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
                 s->channel_order_tab[channels - 1 - !!s->lfe] < 0)
                 return AVERROR_INVALIDDATA;
 
+            if (av_get_channel_layout_nb_channels(avctx->channel_layout) != channels) {
+                av_log(avctx, AV_LOG_ERROR, "Number of channels %d mismatches layout %d\n", channels, av_get_channel_layout_nb_channels(avctx->channel_layout));
+                return AVERROR_INVALIDDATA;
+            }
+
             if (avctx->request_channels == 2 && s->prim_channels > 2) {
                 channels = 2;
                 s->output = DCA_STEREO;