diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 23:18:48 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-02-01 13:56:58 -0500 |
| commit | 10d48fe6d3963842319b1d8d738a318020836e72 (patch) | |
| tree | d99ec767f9cd1fb60e4f81dfc21c1b9623a312ed | |
| parent | af9799790d7a6342027e0261b5dd87657abb7a0b (diff) | |
| download | ffmpeg-10d48fe6d3963842319b1d8d738a318020836e72.tar.gz | |
flashsv: Check diff_start diff_height values
Fix out of array accesses.
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Adresses: CVE-2013-7015
(cherry picked from commit 57070b1468edc6ac8cb3696c817f3c943975d4c1)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/flashsv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 3c5a35c0dd..d55616e856 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -384,6 +384,12 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data, } s->diff_start = get_bits(&gb, 8); s->diff_height = get_bits(&gb, 8); + if (s->diff_start + s->diff_height > cur_blk_height) { + av_log(avctx, AV_LOG_ERROR, + "Block parameters invalid: %d + %d > %d\n", + s->diff_start, s->diff_height, cur_blk_height); + return AVERROR_INVALIDDATA; + } av_log(avctx, AV_LOG_DEBUG, "%dx%d diff start %d height %d\n", i, j, s->diff_start, s->diff_height); |