avformat/utils: Check AVFormatContext->duration in compute_chapters_end() before use
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 2 Dec 2015 21:59:56 +0000 (22:59 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 2 Dec 2015 23:13:27 +0000 (00:13 +0100)
Fixes integer overflow
Fixes: 266ee543812e934f7b4a72923a2701d4/signal_sigabrt_7ffff6ae7cc9_7322_85218d61759d461bdf7387180e8000c9.ogg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/utils.c

index 8cb7d38..4475df9 100644 (file)
@@ -2889,7 +2889,10 @@ enum AVCodecID av_codec_get_id(const AVCodecTag *const *tags, unsigned int tag)
 static void compute_chapters_end(AVFormatContext *s)
 {
     unsigned int i, j;
-    int64_t max_time = s->duration +
+    int64_t max_time = 0;
+
+    if (s->duration > 0)
+        max_time = s->duration +
                        ((s->start_time == AV_NOPTS_VALUE) ? 0 : s->start_time);
 
     for (i = 0; i < s->nb_chapters; i++)