diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-09 00:11:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-09 00:11:21 +0100 |
| commit | bb48056cb2baafff9f051be872c782ae43c68fe1 (patch) | |
| tree | d9f0a9afedd9a05dc4f0ddc887ec435f47005868 | |
| parent | Merge branch 'rs/maintenance-run-outside-repo' (diff) | |
| parent | builtin/bugreport.c: use thread-safe localtime_r() (diff) | |
| download | git-bb48056cb2baafff9f051be872c782ae43c68fe1.tar.xz git-bb48056cb2baafff9f051be872c782ae43c68fe1.zip | |
Merge branch 'tb/bugreport-no-localtime'
Use of non-reentrant localtime() has been removed.
* tb/bugreport-no-localtime:
builtin/bugreport.c: use thread-safe localtime_r()
| -rw-r--r-- | builtin/bugreport.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/bugreport.c b/builtin/bugreport.c index 3ad4b9b62e..ad3cc9c02f 100644 --- a/builtin/bugreport.c +++ b/builtin/bugreport.c @@ -125,6 +125,7 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix) struct strbuf report_path = STRBUF_INIT; int report = -1; time_t now = time(NULL); + struct tm tm; char *option_output = NULL; char *option_suffix = "%Y-%m-%d-%H%M"; const char *user_relative_path = NULL; @@ -147,7 +148,7 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix) strbuf_complete(&report_path, '/'); strbuf_addstr(&report_path, "git-bugreport-"); - strbuf_addftime(&report_path, option_suffix, localtime(&now), 0, 0); + strbuf_addftime(&report_path, option_suffix, localtime_r(&now, &tm), 0, 0); strbuf_addstr(&report_path, ".txt"); switch (safe_create_leading_directories(report_path.buf)) { |