virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avformat/mov: check that child boxes of trak are only present inside it

Browse Source 
Based on the check done for the stco box.

Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit e7d3ff8dcd8c8d02b67a0c2b192b1b4f25cc552e)
This commit is contained in:
James Almer 2024-06-28 21:06:54 -03:00
parent d517a84c85
commit c77a3b8d29
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavformat/mov.c
View File

@ -3062,6 +3062,11 @@ static int mov_read_stsc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
MOVStreamContext *sc; MOVStreamContext *sc;
unsigned int i, entries; 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) if (c->fc->nb_streams < 1)
return 0; return 0;
st = c->fc->streams[c->fc->nb_streams-1]; st = c->fc->streams[c->fc->nb_streams-1];
@ -3158,6 +3163,11 @@ static int mov_read_stps(MOVContext *c, AVIOContext *pb, MOVAtom atom)
MOVStreamContext *sc; MOVStreamContext *sc;
unsigned i, entries; 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) if (c->fc->nb_streams < 1)
return 0; return 0;
st = c->fc->streams[c->fc->nb_streams-1]; st = c->fc->streams[c->fc->nb_streams-1];
@ -3195,6 +3205,11 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, MOVAtom atom)
MOVStreamContext *sc; MOVStreamContext *sc;
unsigned int i, entries; 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) if (c->fc->nb_streams < 1)
return 0; return 0;
st = c->fc->streams[c->fc->nb_streams-1]; st = c->fc->streams[c->fc->nb_streams-1];
@ -3247,6 +3262,11 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
unsigned char* buf; unsigned char* buf;
int ret; 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) if (c->fc->nb_streams < 1)
return 0; return 0;
st = c->fc->streams[c->fc->nb_streams-1]; st = c->fc->streams[c->fc->nb_streams-1];
@ -3336,6 +3356,11 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
int64_t current_dts = 0; int64_t current_dts = 0;
int64_t corrected_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) if (c->fc->nb_streams < 1)
return 0; return 0;
st = c->fc->streams[c->fc->nb_streams-1]; st = c->fc->streams[c->fc->nb_streams-1];
@ -3492,6 +3517,11 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
MOVStreamContext *sc; MOVStreamContext *sc;
unsigned int i, entries, ctts_count = 0; 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) if (c->fc->nb_streams < 1)
return 0; return 0;
st = c->fc->streams[c->fc->nb_streams-1]; st = c->fc->streams[c->fc->nb_streams-1];