[FFmpeg-devel] [PATCH 1/2] avformat/mov: Check STCO location

Michael Niedermayer michael at niedermayer.cc
Sat Jan 11 15:27:22 EET 2020


Fixes: bypassing of checks and assertion failure
Fixes: asan_1003879.mp4

Found-by: Clusterfuzz + asan
Reported-by: Thomas Guilbert <tguilbert at google.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavformat/mov.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 589576b529..75f098af09 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1976,6 +1976,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];
-- 
2.24.0



More information about the ffmpeg-devel mailing list