From: Andreas Cadhalpun Date: Wed, 14 Dec 2016 00:53:14 +0000 (+0100) Subject: 4xm: prevent overflow during bit rate calculation X-Git-Tag: android-x86-7.1-r1~2715 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e558a6348ac10e74c54fb50ffd783ff9b5aec050;p=android-x86%2Fexternal-ffmpeg.git 4xm: prevent overflow during bit rate calculation Reviewed-by: Michael Niedermayer Signed-off-by: Andreas Cadhalpun --- diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 8a50778686..2758b69d29 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -163,6 +163,12 @@ static int parse_strk(AVFormatContext *s, return AVERROR_INVALIDDATA; } + if (fourxm->tracks[track].sample_rate > INT64_MAX / fourxm->tracks[track].bits / fourxm->tracks[track].channels) { + av_log(s, AV_LOG_ERROR, "Overflow during bit rate calculation %d * %d * %d\n", + fourxm->tracks[track].sample_rate, fourxm->tracks[track].bits, fourxm->tracks[track].channels); + return AVERROR_INVALIDDATA; + } + /* allocate a new AVStream */ st = avformat_new_stream(s, NULL); if (!st) @@ -178,7 +184,7 @@ static int parse_strk(AVFormatContext *s, st->codecpar->channels = fourxm->tracks[track].channels; st->codecpar->sample_rate = fourxm->tracks[track].sample_rate; st->codecpar->bits_per_coded_sample = fourxm->tracks[track].bits; - st->codecpar->bit_rate = st->codecpar->channels * + st->codecpar->bit_rate = (int64_t)st->codecpar->channels * st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample; st->codecpar->block_align = st->codecpar->channels *