diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-31 05:01:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 21:07:17 +0200 |
| commit | 03e404740eb13d0483cc0a3e685802fdd79c1bae (patch) | |
| tree | 3d604d676588c00795f22c8c339c26518209d47e | |
| parent | 688da036b15881e5e3cce54147b3d6862452a6c3 (diff) | |
| download | ffmpeg-03e404740eb13d0483cc0a3e685802fdd79c1bae.tar.gz | |
indeo5: check quant_mat
prevents out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8aaa00c3012d425ce50efffadb813ad62d1ff3d5)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/indeo5.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 4c6bfd66d1..eb16726a81 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -219,6 +219,10 @@ static int decode_gop_header(IVI5DecContext *ctx, AVCodecContext *avctx) } if (band->blk_size == 8) { + if(quant_mat >= 5){ + av_log(avctx, AV_LOG_ERROR, "quant_mat %d too large!\n", quant_mat); + return -1; + } band->intra_base = &ivi5_base_quant_8x8_intra[quant_mat][0]; band->inter_base = &ivi5_base_quant_8x8_inter[quant_mat][0]; band->intra_scale = &ivi5_scale_quant_8x8_intra[quant_mat][0]; |