diff options
| author | Nikolas Bowe <nbowe-at-google.com@ffmpeg.org> | 2018-01-18 15:21:56 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-08 13:07:06 +0200 |
| commit | e7701e89ece5e9edfc6f88b3ac242a50e70a5b7d (patch) | |
| tree | 956aa060c95a1122298d3b8affd8e4169eb164a4 | |
| parent | 27fc118d1c7991ec0231205a40f805d960f6e23b (diff) | |
| download | ffmpeg-e7701e89ece5e9edfc6f88b3ac242a50e70a5b7d.tar.gz | |
avformat/matroskadec: Fix float-cast-overflow undefined behavior in matroska_parse_tracks()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e07649e618caedc07eaf2f4d09253de7f77d14f0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/matroskadec.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index fe23f39a31..d6e093e8f7 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1952,8 +1952,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) |