From 5e2202d6f3ac2f3afd714a62437ca6b24f75c09f Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Wed, 5 Jan 2011 19:21:04 +0000 Subject: [PATCH] In mov demuxer, check that gmtime returns a valid value, fix crash, issue #2490 Originally committed as revision 26228 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mov.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2ceb21c70..b60222172 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -591,8 +591,11 @@ static void mov_metadata_creation_time(AVMetadata **metadata, time_t time) { char buffer[32]; if (time) { + struct tm *ptm; time -= 2082844800; /* seconds between 1904-01-01 and Epoch */ - strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", gmtime(&time)); + ptm = gmtime(&time); + if (!ptm) return; + strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", ptm); av_metadata_set2(metadata, "creation_time", buffer, 0); } } -- 2.11.0