diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-10-08 02:06:26 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-03-18 17:50:35 +0100 |
| commit | 2c99aa48d7073a6ccdecc7ff1f88a781a5a62a86 (patch) | |
| tree | 440c108a7e2fa2e7c62c031097ca891c582cc8ff | |
| parent | fdc669fcbb855a35fcc0352d3ab75064b85194a0 (diff) | |
| download | ffmpeg-2c99aa48d7073a6ccdecc7ff1f88a781a5a62a86.tar.gz | |
lavf: fix signed overflow in avformat_find_stream_info()
On the first iteration through this code, last_dts is always
INT64_MIN (AV_NOPTS_VALUE) and the subtraction overflows in
an invalid manner. Although the result is only used if the
input values are valid, performing the subtraction is still
not allowed in a strict environment.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a31e9f68a426f634e002282885c6c2eb1bfbea44)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 65176d416f..57fc836c64 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2356,9 +2356,9 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) } { int64_t last = st->info->last_dts; - int64_t duration= pkt->dts - last; - if(pkt->dts != AV_NOPTS_VALUE && last != AV_NOPTS_VALUE && duration>0){ + if(pkt->dts != AV_NOPTS_VALUE && last != AV_NOPTS_VALUE && pkt->dts > last){ + int64_t duration= pkt->dts - last; double dur= duration * av_q2d(st->time_base); // if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO) |