From 366ac22ea5a8bab63c7f46cdad2ddb2ff22cdbed Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mon, 23 Jan 2012 21:33:34 +0100 Subject: indeo5: prevent null pointer dereference on broken files Found by John Villamil --- libavcodec/indeo5.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavcodec/indeo5.c') diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 019fa2b8da..5263251f8d 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -453,6 +453,10 @@ static int decode_mb_info(IVI5DecContext *ctx, IVIBandDesc *band, ref_mb = tile->ref_mbs; offs = tile->ypos * band->pitch + tile->xpos; + if (!ref_mb && + ((band->qdelta_present && band->inherit_qdelta) || band->inherit_mv)) + return AVERROR_INVALIDDATA; + /* scale factor for motion vectors */ mv_scale = (ctx->planes[0].bands[0].mb_size >> 3) - (band->mb_size >> 3); mv_x = mv_y = 0; -- cgit v1.2.3