avformat/matroskadec: avoid integer overflows in SAR computation

This ignores >64bit
Alternatively we could support that if it occurs in reality

Fixes: negation of -9223372036854775808
Fixes: integer overflows
Fixes: 46072/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-5029840966778880

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
release/5.1
Michael Niedermayer 3 years ago
parent 59a58d1a85
commit e6cad01122
  1. 13
      libavformat/matroskadec.c

@ -2886,11 +2886,14 @@ static int matroska_parse_tracks(AVFormatContext *s)
mkv_stereo_mode_display_mul(track->video.stereo_mode, &display_width_mul, &display_height_mul); mkv_stereo_mode_display_mul(track->video.stereo_mode, &display_width_mul, &display_height_mul);
if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) { if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) {
av_reduce(&st->sample_aspect_ratio.num, if (track->video.display_width && track->video.display_height &&
&st->sample_aspect_ratio.den, st->codecpar->height < INT64_MAX / track->video.display_width / display_width_mul &&
st->codecpar->height * track->video.display_width * display_width_mul, st->codecpar->width < INT64_MAX / track->video.display_height / display_height_mul)
st->codecpar->width * track->video.display_height * display_height_mul, av_reduce(&st->sample_aspect_ratio.num,
INT_MAX); &st->sample_aspect_ratio.den,
st->codecpar->height * track->video.display_width * display_width_mul,
st->codecpar->width * track->video.display_height * display_height_mul,
INT_MAX);
} }
if (st->codecpar->codec_id != AV_CODEC_ID_HEVC) if (st->codecpar->codec_id != AV_CODEC_ID_HEVC)
sti->need_parsing = AVSTREAM_PARSE_HEADERS; sti->need_parsing = AVSTREAM_PARSE_HEADERS;

Loading…
Cancel
Save