diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-04 22:13:39 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-04 22:13:39 +0200 |
commit | 98ff07d1c647e3b413f4b2d00d70ec9e7a0c93ae (patch) | |
tree | 222d35bab3191bacc05f6f902870b670d17f8d23 /libavcodec | |
parent | 47313bbb5f52815e7e9bc20c0ddc747facf81845 (diff) | |
download | ffmpeg-98ff07d1c647e3b413f4b2d00d70ec9e7a0c93ae.tar.gz |
avcodec/dcadec: Check dca_dmixtable index
Found-by: Niels Möller <nisse@lysator.liu.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/dcadec.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 9f6edc2e42..9847cf9842 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -601,6 +601,12 @@ static int dca_parse_audio_coding_header(DCAContext *s, int base_channel, if (get_bits1(&s->gb)) { embedded_downmix = get_bits1(&s->gb); coeff = get_bits(&s->gb, 6); + + if (coeff<1 || coeff>61) { + av_log(s->avctx, AV_LOG_ERROR, "6bit coeff %d is out of range\n", coeff); + return AVERROR_INVALIDDATA; + } + scale_factor = -1.0f / dca_dmix_code((coeff<<2)-3); s->xxch_dmix_sf[s->xxch_chset] = scale_factor; @@ -622,6 +628,10 @@ static int dca_parse_audio_coding_header(DCAContext *s, int base_channel, coeff = get_bits(&s->gb, 7); ichan = dca_xxch2index(s, 1 << i); + if ((coeff&63)<1 || (coeff&63)>61) { + av_log(s->avctx, AV_LOG_ERROR, "7bit coeff %d is out of range\n", coeff); + return AVERROR_INVALIDDATA; + } s->xxch_dmix_coeff[j][ichan] = dca_dmix_code((coeff<<2)-3); } } |