summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <[email protected]>2013-07-14 16:49:43 +0200
committerLuca Barbato <[email protected]>2013-09-29 21:48:57 +0200
commit53c76b68036b4ca81b1342a4c51125c917c26e75 (patch)
tree5651f9c1fd4c6f6b2e7c4cfc20b121e51748a857
parent7999ff8966e0d8cb2ad8229d7740b4b83741708f (diff)
indeo: Do not reference mismatched tiles
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] (cherry picked from commit f9e5261cab067be7278f73d515bc9b601eb56202) Signed-off-by: Luca Barbato <[email protected]>
-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 3c5759b71f..91a42b152f 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -312,6 +312,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++;
}