[FFmpeg-cvslog] indeo: Do not reference mismatched tiles

Luca Barbato git at videolan.org
Tue Aug 27 18:38:47 CEST 2013


ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Sun Jul 14 16:49:43 2013 +0200| [d55f7a174d49c0b2e87254c075013a7008ddf798] | committer: Luca Barbato

indeo: Do not reference mismatched tiles

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
(cherry picked from commit f9e5261cab067be7278f73d515bc9b601eb56202)

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d55f7a174d49c0b2e87254c075013a7008ddf798
---

 libavcodec/ivi_common.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index 80d3572..36293a1 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++;
             }



More information about the ffmpeg-cvslog mailing list