From 5880d788734d9c4e2dc53c6cdec343ee978d3a3f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 29 May 2012 19:28:09 +0200 Subject: [PATCH] movdec: Check count of stts/ctts elements instead of just the pointer. Fixes overreading the array Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 222166eb72..a7bb0762c2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1874,7 +1874,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st) sc->empty_duration = av_rescale(sc->empty_duration, sc->time_scale, mov->time_scale); sc->time_offset = sc->start_time - sc->empty_duration; current_dts = -sc->time_offset; - if (sc->ctts_data && sc->stts_data && + if (sc->ctts_count>0 && sc->stts_count>0 && sc->ctts_data[0].duration / FFMAX(sc->stts_data[0].duration, 1) > 16) { /* more than 16 frames delay, dts are likely wrong this happens with files created by iMovie */