diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-08-05 06:30:24 +0200 |
|---|---|---|
| committer | Sean McGovern <gseanmcg@gmail.com> | 2013-09-23 19:41:09 -0400 |
| commit | 75b1b13aff73bbe78a4da756dd4c048dd3462cb0 (patch) | |
| tree | f55be7ed3715273055eecd14017776b6e9d5e340 | |
| parent | 54e03863691dcae73260f70108b3731b70773e7c (diff) | |
| download | ffmpeg-75b1b13aff73bbe78a4da756dd4c048dd3462cb0.tar.gz | |
vc1: check mb_height validity.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 43bacd5b7d3d265a77cd29d8abb131057796aecc)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -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 752f22fe0a..e1aa4e65d8 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5581,6 +5581,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, v->mv_f[1] = tmp[1]; } mb_height = s->mb_height >> v->field_mode; + + if (!mb_height) { + av_log(v->s.avctx, AV_LOG_ERROR, "Invalid mb_height.\n"); + goto err; + } + for (i = 0; i <= n_slices; i++) { if (i > 0 && slices[i - 1].mby_start >= mb_height) { if (v->field_mode <= 0) { |