mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
avformat/utils: Fix integer overflow in end time calculation in update_stream_timings()
Fixes: crbug 829153 Reported-by: Matt Wolenetz <wolenetz@google.com> Reviewed-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c48ceff786bdc96fdc64417118c457d03bd19871) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
78c8e77c86
commit
ca119e9456
@ -2611,7 +2611,7 @@ static void update_stream_timings(AVFormatContext *ic)
|
||||
else if (start_time > start_time_text)
|
||||
av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream starttime %f\n", start_time_text / (float)AV_TIME_BASE);
|
||||
|
||||
if (end_time == INT64_MIN || (end_time < end_time_text && end_time_text - end_time < AV_TIME_BASE)) {
|
||||
if (end_time == INT64_MIN || (end_time < end_time_text && end_time_text - (uint64_t)end_time < AV_TIME_BASE)) {
|
||||
end_time = end_time_text;
|
||||
} else if (end_time < end_time_text) {
|
||||
av_log(ic, AV_LOG_VERBOSE, "Ignoring outlier non primary stream endtime %f\n", end_time_text / (float)AV_TIME_BASE);
|
||||
|
Loading…
x
Reference in New Issue
Block a user