aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ivi_common.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-07-14 16:49:43 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-08-24 12:11:57 +0200
commitd55f7a174d49c0b2e87254c075013a7008ddf798 (patch)
tree754c8e6511c7d747c0a7d32afe64618a0d0e5852 /libavcodec/ivi_common.c
parentfbbe487b1c1f21339cff9ca86c3dfc495ad1c2c6 (diff)
downloadffmpeg-d55f7a174d49c0b2e87254c075013a7008ddf798.tar.gz
indeo: Do not reference mismatched tiles
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit f9e5261cab067be7278f73d515bc9b601eb56202) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec/ivi_common.c')
-rw-r--r--libavcodec/ivi_common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index 80d35725be..36293a12cb 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -343,6 +343,8 @@ static int ivi_init_tiles(IVIBandDesc *band, IVITile *ref_tile,
tile->ref_mbs = 0;
if (p || b) {
+ if (tile->num_MBs != ref_tile->num_MBs)
+ return AVERROR_INVALIDDATA;
tile->ref_mbs = ref_tile->mbs;
ref_tile++;
}