diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-08-24 21:30:46 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-09-02 19:28:29 +0200 |
| commit | df33a58e5311ee9a64a573889b883a80e981af7b (patch) | |
| tree | b30dc07a35dda9b3aefbce08ab3ad3e22d040f1e /libavformat/utils.c | |
| parent | fab694dd3931b1c0bc3c598c3f88b1902c14a303 (diff) | |
| download | ffmpeg-df33a58e5311ee9a64a573889b883a80e981af7b.tar.gz | |
lavf: avoid integer overflow when estimating bitrate
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index eb89f43636..3644bcd724 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1757,8 +1757,13 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic) int bit_rate = 0; for(i=0;i<ic->nb_streams;i++) { st = ic->streams[i]; - if (st->codec->bit_rate > 0) - bit_rate += st->codec->bit_rate; + if (st->codec->bit_rate > 0) { + if (INT_MAX - st->codec->bit_rate > bit_rate) { + bit_rate = 0; + break; + } + bit_rate += st->codec->bit_rate; + } } ic->bit_rate = bit_rate; } |