kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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()
maint
Junio C Hamano 2020-12-08 15:11:21 -08:00
parent f2a75cb312 4f6460df55
commit bb48056cb2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/bugreport.c
View File

@ -125,6 +125,7 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix)
struct strbuf report_path = STRBUF_INIT; struct strbuf report_path = STRBUF_INIT;
int report = -1; int report = -1;
time_t now = time(NULL); time_t now = time(NULL);
struct tm tm;
char *option_output = NULL; char *option_output = NULL;
char *option_suffix = "%Y-%m-%d-%H%M"; char *option_suffix = "%Y-%m-%d-%H%M";
const char *user_relative_path = NULL; 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_complete(&report_path, '/');


strbuf_addstr(&report_path, "git-bugreport-"); 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"); strbuf_addstr(&report_path, ".txt");


switch (safe_create_leading_directories(report_path.buf)) { switch (safe_create_leading_directories(report_path.buf)) {