diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-10-08 02:06:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-04 01:00:18 +0100 |
| commit | edc942202b577946c265fe9fdff236fac2b2cc2f (patch) | |
| tree | 471bb3404348f189abcf6fd21bbd6cd017e50359 | |
| parent | f7be632cbde8aa094535edf0af3a30a7556acbac (diff) | |
| download | ffmpeg-edc942202b577946c265fe9fdff236fac2b2cc2f.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: Michael Niedermayer <michaelni@gmx.at>
| -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 b15582acb1..400d96826d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2396,9 +2396,9 @@ int av_find_stream_info(AVFormatContext *ic) } { 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) |