Based on the check done for the stco box.
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/mov.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index ba5f85e7e3..a2e187ff2f 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3059,6 +3059,11 @@ static int mov_read_stsc(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
MOVStreamContext *sc;
unsigned int i, entries;
+ if (c->trak_index < 0) {
+ av_log(c->fc, AV_LOG_WARNING, "STSC outside TRAK\n");
+ return 0;
+ }
+
if (c->fc->nb_streams < 1)
return 0;
st = c->fc->streams[c->fc->nb_streams-1];
@@ -3155,6 +3160,11 @@ static int mov_read_stps(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
MOVStreamContext *sc;
unsigned i, entries;
+ if (c->trak_index < 0) {
+ av_log(c->fc, AV_LOG_WARNING, "STPS outside TRAK\n");
+ return 0;
+ }
+
if (c->fc->nb_streams < 1)
return 0;
st = c->fc->streams[c->fc->nb_streams-1];
@@ -3192,6 +3202,11 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
MOVStreamContext *sc;
unsigned int i, entries;
+ if (c->trak_index < 0) {
+ av_log(c->fc, AV_LOG_WARNING, "STSS outside TRAK\n");
+ return 0;
+ }
+
if (c->fc->nb_streams < 1)
return 0;
st = c->fc->streams[c->fc->nb_streams-1];
@@ -3244,6 +3259,11 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
unsigned char* buf;
int ret;
+ if (c->trak_index < 0) {
+ av_log(c->fc, AV_LOG_WARNING, "STSZ outside TRAK\n");
+ return 0;
+ }
+
if (c->fc->nb_streams < 1)
return 0;
st = c->fc->streams[c->fc->nb_streams-1];
@@ -3333,6 +3353,11 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
int64_t current_dts = 0;
int64_t corrected_dts = 0;
+ if (c->trak_index < 0) {
+ av_log(c->fc, AV_LOG_WARNING, "STTS outside TRAK\n");
+ return 0;
+ }
+
if (c->fc->nb_streams < 1)
return 0;
st = c->fc->streams[c->fc->nb_streams-1];
@@ -3489,6 +3514,11 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
MOVStreamContext *sc;
unsigned int i, entries, ctts_count = 0;
+ if (c->trak_index < 0) {
+ av_log(c->fc, AV_LOG_WARNING, "CTTS outside TRAK\n");
+ return 0;
+ }
+
if (c->fc->nb_streams < 1)
return 0;
st = c->fc->streams[c->fc->nb_streams-1];
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
