diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-01-11 12:09:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-01 12:49:26 +0200 |
| commit | 753d8e48548acc750264fc9e9d4e5e75e782f6f4 (patch) | |
| tree | 2f5e0d6a9c7cfa77eee3347e78826083f84e5c25 | |
| parent | bb4afc18b8177fb04664d84e04ca4a00ebcb7acc (diff) | |
| download | ffmpeg-753d8e48548acc750264fc9e9d4e5e75e782f6f4.tar.gz | |
avformat/mov: Check STCO location
Fixes: bypassing of checks and assertion failure
Fixes: asan_1003879.mp4
Found-by: Clusterfuzz + asan
Reported-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1cd41840208bce7e690a4ccc48077567418a0aa8)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index f80bc47f38..da073b025b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1743,6 +1743,10 @@ static int mov_read_stco(MOVContext *c, AVIOContext *pb, MOVAtom atom) MOVStreamContext *sc; unsigned int i, entries; + if (c->trak_index < 0) { + av_log(c->fc, AV_LOG_WARNING, "STCO outside TRAK\n"); + return 0; + } if (c->fc->nb_streams < 1) return 0; st = c->fc->streams[c->fc->nb_streams-1]; |