diff options
| author | Michael Niedermayer <[email protected]> | 2012-05-29 19:28:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2012-06-07 00:55:23 +0200 |
| commit | e0f0486c7fb1ebca86c1cfc3f24d78a62907f630 (patch) | |
| tree | 1339780aa9fc6d756071f6ff7e99529245905439 | |
| parent | 56e987d2cd75f9e2ca77c08bb59449a11e58a53a (diff) | |
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 <[email protected]>
(cherry picked from commit 5880d788734d9c4e2dc53c6cdec343ee978d3a3f)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |