rv10: always check image size not just in some cases.
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Nov 2012 01:16:56 +0000 (02:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Nov 2012 01:17:26 +0000 (02:17 +0100)
Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rv10.c

index a5181b3..d06a2fe 100644 (file)
@@ -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);