diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 09:39:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 09:39:51 +0100 |
| commit | 525289ed261fb54366fc0983cbb13af0a0e3d8ca (patch) | |
| tree | be1219fabd9e336d9636bada64f6f2812a517245 | |
| parent | 77c33424c1754d38182880bf320e5a6fcc264611 (diff) | |
| parent | 57070b1468edc6ac8cb3696c817f3c943975d4c1 (diff) | |
| download | ffmpeg-525289ed261fb54366fc0983cbb13af0a0e3d8ca.tar.gz | |
Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'
* commit '57070b1468edc6ac8cb3696c817f3c943975d4c1':
flashsv: Check diff_start diff_height values
Conflicts:
libavcodec/flashsv.c
See: 880c73cd76109697447fbfbaa8e5ee5683309446
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/flashsv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 62b7fae148..7d8375ab4c 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -391,7 +391,9 @@ 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\n"); + 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, |