diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-15 18:04:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-21 20:43:39 +0200 |
| commit | ba82b23a1d079530281ea3ac71eaaea9126c7429 (patch) | |
| tree | fa6496b8a268b9a9b7705c070258a8e570b2363c | |
| parent | 665b343f9252d9d47f8c1ba5b8db74549affa33d (diff) | |
| download | ffmpeg-ba82b23a1d079530281ea3ac71eaaea9126c7429.tar.gz | |
avcodec/dcadec: Check scale table index
Fixes CID1297594 part 1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0f3e6959bfa67d12cd5a173b86eb15abd7d9e4d5)
Conflicts:
libavcodec/dcadec.c
| -rw-r--r-- | libavcodec/dcadec.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index a78986ab4d..b2e5c7faa4 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -1866,23 +1866,34 @@ static int dca_xbr_parse_frame(DCAContext *s) for(i = 0; i < n_xbr_ch[chset]; i++) { const uint32_t *scale_table; int nbits; + int scale_table_size; if (s->scalefactor_huffman[chan_base+i] == 6) { scale_table = scale_factor_quant7; + scale_table_size = FF_ARRAY_ELEMS(scale_factor_quant7); } else { scale_table = scale_factor_quant6; + scale_table_size = FF_ARRAY_ELEMS(scale_factor_quant6); } nbits = anctemp[i]; for(j = 0; j < active_bands[chset][i]; j++) { if(abits_high[i][j] > 0) { - scale_table_high[i][j][0] = - scale_table[get_bits(&s->gb, nbits)]; + int index = get_bits(&s->gb, nbits); + if (index >= scale_table_size) { + av_log(s->avctx, AV_LOG_ERROR, "scale table index %d invalid\n", index); + return AVERROR_INVALIDDATA; + } + scale_table_high[i][j][0] = scale_table[index]; if(xbr_tmode && s->transition_mode[i][j]) { - scale_table_high[i][j][1] = - scale_table[get_bits(&s->gb, nbits)]; + int index = get_bits(&s->gb, nbits); + if (index >= scale_table_size) { + av_log(s->avctx, AV_LOG_ERROR, "scale table index %d invalid\n", index); + return AVERROR_INVALIDDATA; + } + scale_table_high[i][j][1] = scale_table[index]; } } } |