lavf: Make sure avg_frame_rate can be calculated without integer overflow
authorMartin Storsjö <martin@martin.st>
Mon, 15 Jul 2013 13:44:20 +0000 (16:44 +0300)
committerLuca Barbato <lu_zero@gentoo.org>
Sat, 24 Aug 2013 10:12:26 +0000 (12:12 +0200)
If either of the deltas is too large for the multiplications to
succeed, don't use this for setting the avg frame rate.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit e740929a071ab032ffa382e89da69c6ec7cf882c)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavformat/utils.c

index 085ae83..e1511ee 100644 (file)
@@ -2493,6 +2493,9 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
                 int      best_fps = 0;
                 double best_error = 0.01;
 
+                if (delta_dts     >= INT64_MAX / st->time_base.num ||
+                    delta_packets >= INT64_MAX / st->time_base.den)
+                    continue;
                 av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
                           delta_packets*(int64_t)st->time_base.den,
                           delta_dts*(int64_t)st->time_base.num, 60000);