summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-04-01 19:18:36 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-04-04 00:56:21 +0200
commit39ee3ddff87a12e108fc4e0d36f756d0ca080472 (patch)
tree57e049b6dc6283be61f70ef33d3cf48c4cac269c /libavformat
parentc169ab4112c063f53440c51f007ffce0c0d394b1 (diff)
avformat/mov: Check creation_time for overflow
Fixes integer overflow Fixes: 701640 Found-by: Found-by: Thomas Guilbert <tguilbert@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 4550cf0ad4..90bc2499da 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1186,6 +1186,12 @@ static void mov_metadata_creation_time(AVDictionary **metadata, int64_t time)
if (time) {
if(time >= 2082844800)
time -= 2082844800; /* seconds between 1904-01-01 and Epoch */
+
+ if ((int64_t)(time * 1000000ULL) / 1000000 != time) {
+ av_log(NULL, AV_LOG_DEBUG, "creation_time is not representable\n");
+ return;
+ }
+
avpriv_dict_set_timestamp(metadata, "creation_time", time * 1000000);
}
}