diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-08-14 10:18:39 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-08-18 17:06:46 +0200 |
| commit | 33f10546ec012ad4e1054b57317885cded7e953e (patch) | |
| tree | f14dfe7eca92ad6f317d70ea95159838f2f62737 | |
| parent | 09b23786b3986502ee88d4907356979127169bdd (diff) | |
| download | ffmpeg-33f10546ec012ad4e1054b57317885cded7e953e.tar.gz | |
vc1: check that slices have a positive height
Fixes possible invalid reads.
CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| -rw-r--r-- | libavcodec/vc1dec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 3d042d0b0d..b26fbf2eff 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -881,6 +881,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, s->end_mb_y = (i == n_slices ) ? mb_height : FFMIN(mb_height, slices[i].mby_start % mb_height); else s->end_mb_y = (i <= n_slices1 + 1) ? mb_height : FFMIN(mb_height, slices[i].mby_start % mb_height); + + if (s->end_mb_y <= s->start_mb_y) { + av_log(v->s.avctx, AV_LOG_ERROR, "Invalid slice size\n"); + goto err; + } + ff_vc1_decode_blocks(v); if (i != n_slices) s->gb = slices[i].gb; |