diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-12-07 13:53:56 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-12-08 19:35:16 +0000 |
| commit | 91ac403b1316d59b4f43c4ea0f237e24cec2819a (patch) | |
| tree | 78e06c14b5084e8b0c849837860801fc09d5e894 | |
| parent | 6a1aa5cb26479eda12320e9b9ced9cc058bf5b33 (diff) | |
| download | ffmpeg-91ac403b1316d59b4f43c4ea0f237e24cec2819a.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>
| -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 12b054d935..cd46caf3fd 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1762,7 +1762,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 seek_frame_generic() but with new ts semantics } |