indeo4: better mv check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/4/head
Michael Niedermayer 13 years ago
parent c855ece101
commit 140c54ea0b
  1. 8
      libavcodec/indeo4.c

@ -569,10 +569,10 @@ static int decode_mb_info(IVI4DecContext *ctx, IVIBandDesc *band,
s= band->is_halfpel; s= band->is_halfpel;
if (mb->type) if (mb->type)
if ( x + (mv_x >>s) + (y+ (mv_y >>s))*band->pitch < 0 || if ( x + (mb->mv_x >>s) + (y+ (mb->mv_y >>s))*band->pitch < 0 ||
x + ((mv_x+s)>>s) + band->mb_size - 1 x + ((mb->mv_x+s)>>s) + band->mb_size - 1
+ (y+band->mb_size - 1 +((mv_y+s)>>s))*band->pitch > band->height*band->pitch -1) { + (y+band->mb_size - 1 +((mb->mv_y+s)>>s))*band->pitch > band->bufsize -1) {
av_log(avctx, AV_LOG_ERROR, "motion vector %d %d outside reference\n", x*s + mv_x, y*s + mv_y); av_log(avctx, AV_LOG_ERROR, "motion vector %d %d outside reference\n", x*s + mb->mv_x, y*s + mb->mv_y);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

Loading…
Cancel
Save