diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-08-05 06:30:24 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-08-05 16:24:13 +0200 |
| commit | 43bacd5b7d3d265a77cd29d8abb131057796aecc (patch) | |
| tree | 419ef6c6116ea69e73fb65cb61aac3dfc62387ee /libavcodec | |
| parent | 090cd0631140ac1a3a795d2adfac5dbf5e381aa2 (diff) | |
| download | ffmpeg-streaming-43bacd5b7d3d265a77cd29d8abb131057796aecc.zip ffmpeg-streaming-43bacd5b7d3d265a77cd29d8abb131057796aecc.tar.gz | |
vc1: check mb_height validity.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec')
| -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 20633d7..0feff21 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5966,6 +5966,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, s->uvlinesize <<= 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) { |
