---
libavformat/matroskadec.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 496499b553..cd9e1f56c2 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2096,8 +2096,16 @@ static int matroska_parse_tracks(AVFormatContext *s)
}
if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
- if (!track->default_duration && track->video.frame_rate > 0)
- track->default_duration = 1000000000 / track->video.frame_rate;
+ if (!track->default_duration && track->video.frame_rate > 0) {
+ double default_duration = 1000000000 / track->video.frame_rate;
+ if (default_duration > UINT64_MAX || default_duration < 0) {
+ av_log(matroska->ctx, AV_LOG_WARNING,
+ "Invalid frame rate %e. Cannot calculate default
duration.\n",
+ track->video.frame_rate);
+ } else {
+ track->default_duration = default_duration;
+ }
+ }
if (track->video.display_width == -1)
track->video.display_width = track->video.pixel_width;
if (track->video.display_height == -1)
--
2.16.0.rc1.238.g530d649a79-goog
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
