mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
avformat/mov: check that child boxes of trak are only present inside it
Based on the check done for the stco box. Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
2aa63784b5
commit
e7d3ff8dcd
@ -3145,6 +3145,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];
|
||||
@ -3241,6 +3246,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];
|
||||
@ -3278,6 +3288,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];
|
||||
@ -3330,6 +3345,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];
|
||||
@ -3419,6 +3439,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];
|
||||
@ -3575,6 +3600,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];
|
||||
|
Loading…
x
Reference in New Issue
Block a user