Merge branch 'mingw-strftime'

This topic branch works around an out-of-memory bug when the user specified a format via --date=format:<format> that strftime() does not like. Reported by Stefan Naewe. Signed-off-by: Johannes Schindelin <[email protected]>
git-for-windows · Oct 4, 2016 · e408b09 · e408b09
2 parents 953b03c + 6112fa2
commit e408b09
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -888,6 +888,17 @@ int mingw_utime (const char *file_name, const struct utimbuf *times)
 	return rc;
 }
 
+#undef strftime
+size_t mingw_strftime(char *s, size_t max,
+		      const char *format, const struct tm *tm)
+{
+	size_t ret = strftime(s, max, format, tm);
+
+	if (!ret && errno == EINVAL)
+		die("invalid strftime format: '%s'", format);
+	return ret;
+}
+
 unsigned int sleep (unsigned int seconds)
 {
 	Sleep(seconds*1000);

diff --git a/compat/mingw.h b/compat/mingw.h
@@ -397,6 +397,9 @@ extern int (*lstat)(const char *file_name, struct stat *buf);
 
 int mingw_utime(const char *file_name, const struct utimbuf *times);
 #define utime mingw_utime
+size_t mingw_strftime(char *s, size_t max,
+		   const char *format, const struct tm *tm);
+#define strftime mingw_strftime
 
 pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
 		     const char *dir,