From caa2fa2c69e760b3dad6358178ccbad39ba8a268 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 15 Nov 2012 02:16:56 +0100 Subject: [PATCH] rv10: always check image size not just in some cases. Fixes division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/rv10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index a5181b38a6..d06a2fe1b2 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -398,7 +398,8 @@ static int rv20_decode_picture_header(RVDecContext *rv) 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) + } + if (av_image_check_size(s->width, s->height, 0, s->avctx) < 0) return AVERROR_INVALIDDATA; mb_pos = ff_h263_decode_mba(s);