mov: Do not read past the end of the ctts_data table.

Message ID 20120322205813.4223D5E0A6@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau March 22, 2012, 8:58 p.m.
Module: libav
Branch: master
Commit: 86f2ae06b92d42580ae7ebd86d52c9b7acbc2f13

Author:    Alex Converse <alex.converse@gmail.com>
Committer: Alex Converse <alex.converse@gmail.com>
Date:      Wed Mar 21 11:24:10 2012 -0700

mov: Do not read past the end of the ctts_data table.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

---

 libavformat/mov.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7b21423..75dec37 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2713,7 +2713,7 @@  static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
 
     pkt->stream_index = sc->ffindex;
     pkt->dts = sample->timestamp;
-    if (sc->ctts_data) {
+    if (sc->ctts_data && sc->ctts_index < sc->ctts_count) {
         pkt->pts = pkt->dts + sc->dts_shift + sc->ctts_data[sc->ctts_index].duration;
         /* update ctts context */
         sc->ctts_sample++;