diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-01-25 15:49:54 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-02-26 10:03:15 +0100 |
| commit | d19e3e19d67b50cb5614ead2e0f125678e1c257d (patch) | |
| tree | 2308f5d127b299730757ec908f7d582daaca2e51 | |
| parent | 04597e25952d399a350062c1824587c230cdd5b4 (diff) | |
| download | ffmpeg-d19e3e19d67b50cb5614ead2e0f125678e1c257d.tar.gz | |
vc1: prevent null pointer dereference on broken files
CC: libav-stable@libav.org
(cherry picked from commit 510ef04a461b3b54a762c6141ad880cbed85981f)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/vc1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index fa952739bb..0425a87e41 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5708,7 +5708,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, if (!v->field_mode || v->second_field) 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); + s->end_mb_y = (i <= n_slices1 + 1) ? mb_height : FFMIN(mb_height, slices[i].mby_start % mb_height); vc1_decode_blocks(v); if (i != n_slices) s->gb = slices[i].gb; |