[FFmpeg-cvslog] avidec: check for valid bit_rate range
Andreas Cadhalpun
git at videolan.org
Thu May 14 20:58:42 CEST 2015
ffmpeg | branch: release/2.6 | Andreas Cadhalpun <andreas.cadhalpun at googlemail.com> | Mon May 4 21:07:52 2015 +0200| [0cb8d786f29c1cac6639ae7d84f5af40553793b4] | committer: Andreas Cadhalpun
avidec: check for valid bit_rate range
If bit_rate is negative, it can trigger an av_assert2 in av_rescale_rnd.
Since av_rescale returns int64_t, but st->codec_bit_rate is int, it can
also overflow into a negative value.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0eec40b713eee84e2aec8af35ccce059817cad2a)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cb8d786f29c1cac6639ae7d84f5af40553793b4
---
libavformat/avidec.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 00f0037..fbfd913 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -450,6 +450,7 @@ static int calculate_bitrate(AVFormatContext *s)
int64_t len = 0;
AVStream *st = s->streams[i];
int64_t duration;
+ int64_t bitrate;
for (j = 0; j < st->nb_index_entries; j++)
len += st->index_entries[j].size;
@@ -457,7 +458,10 @@ static int calculate_bitrate(AVFormatContext *s)
if (st->nb_index_entries < 2 || st->codec->bit_rate > 0)
continue;
duration = st->index_entries[j-1].timestamp - st->index_entries[0].timestamp;
- st->codec->bit_rate = av_rescale(8*len, st->time_base.den, duration * st->time_base.num);
+ bitrate = av_rescale(8*len, st->time_base.den, duration * st->time_base.num);
+ if (bitrate <= INT_MAX && bitrate > 0) {
+ st->codec->bit_rate = bitrate;
+ }
}
return 1;
}
More information about the ffmpeg-cvslog
mailing list