virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/utils: Check start/end before computing duration in update_stream_timings()

Browse Source 
Fixes undefined behavior
Fixes: 637428.ogg

Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-12-03 03:02:41 +01:00
parent f88c8e0dc3
commit 90da187f1d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/utils.c
View File

@@ -2597,11 +2597,14 @@ static void update_stream_timings(AVFormatContext *ic)
if (ic->nb_programs > 1) { if (ic->nb_programs > 1) {
for (i = 0; i < ic->nb_programs; i++) { for (i = 0; i < ic->nb_programs; i++) {
p = ic->programs[i]; p = ic->programs[i];
if (p->start_time != AV_NOPTS_VALUE && p->end_time > p->start_time) if (p->start_time != AV_NOPTS_VALUE &&
p->end_time > p->start_time &&
p->end_time - (uint64_t)p->start_time <= INT64_MAX)
duration = FFMAX(duration, p->end_time - p->start_time); duration = FFMAX(duration, p->end_time - p->start_time);
} }
} else } else if (end_time >= start_time && end_time - (uint64_t)start_time <= INT64_MAX) {
duration = FFMAX(duration, end_time - start_time); duration = FFMAX(duration, end_time - start_time);
}
} }
} }
if (duration != INT64_MIN && duration > 0 && ic->duration == AV_NOPTS_VALUE) { if (duration != INT64_MIN && duration > 0 && ic->duration == AV_NOPTS_VALUE) {