[FFmpeg-cvslog] lavf/mxfdec: validate month/day before date formatting

Hendrik Leppkes git at videolan.org
Sat Apr 13 18:12:17 CEST 2013


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Apr 13 15:45:57 2013 +0200| [423089e964410adbf13af3de42e3c9dd5a1babd6] | committer: Michael Niedermayer

lavf/mxfdec: validate month/day before date formatting

Some implementations of strftime do not like invalid values for
month/day, so ensure it doesn't happen.

Reviewed-by: Matthieu Bouron <matthieu.bouron at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=423089e964410adbf13af3de42e3c9dd5a1babd6
---

 libavformat/mxfdec.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 4ceaaee..33e1eb4 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1668,6 +1668,10 @@ static int mxf_timestamp_to_str(uint64_t timestamp, char **str)
     time.tm_min  = (timestamp >> 16 & 0xFF);
     time.tm_sec  = (timestamp >> 8  & 0xFF);
 
+    /* ensure month/day are valid */
+    time.tm_mon  = FFMAX(time.tm_mon, 0);
+    time.tm_mday = FFMAX(time.tm_mday, 1);
+
     *str = av_mallocz(32);
     if (!*str)
         return AVERROR(ENOMEM);



More information about the ffmpeg-cvslog mailing list