diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-01-24 21:50:50 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-01-25 16:18:54 +0100 |
| commit | c3e10ae4127c998b809066926a410f40ebd47593 (patch) | |
| tree | 547683547e92d0b99eb5358284e3039191525526 | |
| parent | 4e81b5f517443c0e60df3f2c6ddc8cac96a34af8 (diff) | |
| download | ffmpeg-c3e10ae4127c998b809066926a410f40ebd47593.tar.gz | |
rv20: prevent calling ff_h263_decode_mba() with unset height/width
Prevents a crash of VLC during playback of a invalid matroska file,
found by John Villamil <johnv@matasano.com>.
CC: libav-stable@libav.org
| -rw-r--r-- | libavcodec/rv10.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 9f2fe77af7..1d7fd6b468 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -362,7 +362,8 @@ static int rv20_decode_picture_header(MpegEncContext *s) if(s->avctx->debug & FF_DEBUG_PICT_INFO){ av_log(s->avctx, AV_LOG_DEBUG, "F %d/%d\n", f, rpr_bits); } - } + } else if (av_image_check_size(s->width, s->height, 0, s->avctx) < 0) + return AVERROR_INVALIDDATA; mb_pos = ff_h263_decode_mba(s); |