[libav-commits] indeo5: prevent null pointer dereference on broken files

[Janne Grunau]

Module: libav
Branch: release/0.7
Commit: 8148833193c6773b3db9b1759e62c2295d487ec7

Author:    Janne Grunau <janne-libav at jannau.net>
Committer: Reinhard Tartler <siretart at tauware.de>
Date:      Mon Jan 23 21:33:34 2012 +0100

indeo5: prevent null pointer dereference on broken files

Found by John Villamil <johnv at matasano.com>
(cherry picked from commit 366ac22ea5a8bab63c7f46cdad2ddb2ff22cdbed)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

---

 libavcodec/indeo5.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index ba1bc18..c3f73ea 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;