[FFmpeg-cvslog] mov: fix self referencing timecode tracks

Michael Niedermayer git at videolan.org
Wed Feb 20 16:11:17 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 20 15:45:50 2013 +0100| [2ccaab9709aadc51625a28597d6a9012607958b4] | committer: Michael Niedermayer

mov: fix self referencing timecode tracks

Fixes read after free.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ccaab9709aadc51625a28597d6a9012607958b4
---

 libavformat/mov.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 5575b82..86ec95c 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3173,7 +3173,7 @@ static int mov_read_header(AVFormatContext *s)
                 if (s->streams[j]->id == sc->timecode_track)
                     tmcd_st_id = j;
 
-            if (tmcd_st_id < 0)
+            if (tmcd_st_id < 0 || tmcd_st_id == i)
                 continue;
             tcr = av_dict_get(s->streams[tmcd_st_id]->metadata, "timecode", NULL, 0);
             if (tcr)



More information about the ffmpeg-cvslog mailing list