highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/matroskadec: Fix float-cast-overflow undefined behavior in matroska_parse_tracks()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e07649e618caedc07eaf2f4d09253de7f77d14f0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Nikolas Bowe 2018-01-18 15:21:56 -08:00 committed by Michael Niedermayer
parent 7b56d6584c
commit facd0521e4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/matroskadec.c
View File

@ -2089,8 +2089,16 @@ static int matroska_parse_tracks(AVFormatContext *s)
} }
if (track->type == MATROSKA_TRACK_TYPE_VIDEO) { if (track->type == MATROSKA_TRACK_TYPE_VIDEO) {
if (!track->default_duration && track->video.frame_rate > 0) if (!track->default_duration && track->video.frame_rate > 0) {
track->default_duration = 1000000000 / track->video.frame_rate; 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) if (track->video.display_width == -1)
track->video.display_width = track->video.pixel_width; track->video.display_width = track->video.pixel_width;
if (track->video.display_height == -1) if (track->video.display_height == -1)