From 9bb7e2bd90f393c6fc9b4bfa8a523018434b7aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sun, 8 Mar 2015 00:19:45 +0200 Subject: [PATCH] mxfdec: Fix the error handling for when strftime fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The str variable is a char ** here. Signed-off-by: Martin Storsjö (cherry picked from commit 6448f15af02f2c3cf0df8cb8237957e426041f2d) Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 0c88a8ae9c..636a3d8932 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1976,7 +1976,7 @@ static int mxf_timestamp_to_str(uint64_t timestamp, char **str) if (!*str) return AVERROR(ENOMEM); if (!strftime(*str, 32, "%Y-%m-%d %H:%M:%S", &time)) - str[0] = '\0'; + (*str)[0] = '\0'; return 0; }