Browse Source

indeo5: prevent null pointer dereference on broken files

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
tags/n0.10.6
Janne Grunau Reinhard Tartler 14 years ago
parent
commit
3efe6becc7
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavcodec/indeo5.c

+ 4
- 0
libavcodec/indeo5.c View File

@@ -426,6 +426,10 @@ static int decode_mb_info(IVI45DecContext *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;


Loading…
Cancel
Save