diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-01 12:40:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-06 12:40:50 +0100 |
| commit | a3ec4b307b4f688643b46aefb4b50584236a04d3 (patch) | |
| tree | 8cf1557850f5ac7bfecfeae719e219bf252bd2e1 | |
| parent | 95bdbfe85159b0b6f576ae23e2b758a169ea409a (diff) | |
| download | ffmpeg-a3ec4b307b4f688643b46aefb4b50584236a04d3.tar.gz | |
avformat/dump: Fix integer overflow in av_dump_format()
Fixes part of mozilla bug 1229167
Found-by: Tyson Smith
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8e7f4520226d2d9ad6a58ad6c32d1455a8b244b2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/dump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/dump.c b/libavformat/dump.c index c4434b3e0b..4a88e0743c 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -430,7 +430,7 @@ void av_dump_format(AVFormatContext *ic, int index, av_log(NULL, AV_LOG_INFO, " Duration: "); if (ic->duration != AV_NOPTS_VALUE) { int hours, mins, secs, us; - int64_t duration = ic->duration + 5000; + int64_t duration = ic->duration + (ic->duration <= INT64_MAX - 5000 ? 5000 : 0); secs = duration / AV_TIME_BASE; us = duration % AV_TIME_BASE; mins = secs / 60; |