diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-12-07 13:53:56 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-05-09 11:29:05 +0200 |
| commit | c65763a2c677d75388828b9411a69e95bd3ab7af (patch) | |
| tree | 5d64d2df82f3c487c195386f7f4ab847138ad158 | |
| parent | 9c713f30e4913a28d93eb37ea5db7f62be4c0ef6 (diff) | |
| download | ffmpeg-c65763a2c677d75388828b9411a69e95bd3ab7af.tar.gz | |
lavf: fix arithmetic overflows in avformat_seek_file()
The values compared here can be more than INT64_MAX apart. Since the
difference is always positive, converting to uint64_t before subtracting
gives the correct result without overflows.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 91ac403b1316d59b4f43c4ea0f237e24cec2819a)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index be679258a0..b97809f8e6 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1791,7 +1791,7 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int //Fallback to old API if new is not implemented but old is //Note the old has somewat different sematics if(s->iformat->read_seek || 1) - return av_seek_frame(s, stream_index, ts, flags | (ts - min_ts > (uint64_t)(max_ts - ts) ? AVSEEK_FLAG_BACKWARD : 0)); + return av_seek_frame(s, stream_index, ts, flags | ((uint64_t)ts - min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0)); // try some generic seek like av_seek_frame_generic() but with new ts semantics } |