mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-09 21:06:11 +02:00
Code

bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option 

`git bugreport` does not complain when `--no-suffix` is given, but
it leads to a segmentation fault as the it is not prepared to see a
NULL assigned to the option_suffix variable.

Signed-off-by: Jiamu Sun <barroit@linux.com>
Acked-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jiamu Sun 2024-03-14 04:00:16 +00:00 committed by Junio C Hamano
parent 3c2a3fdc38
commit b3b57c69da
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-bugreport.txt
View File

@ -8,7 +8,8 @@ git-bugreport - Collect information for user to file a bug report
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git bugreport' [(-o | --output-directory) <path>] [(-s | --suffix) <format>] 'git bugreport' [(-o | --output-directory) <path>]
[(-s | --suffix) <format> | --no-suffix]
[--diagnose[=<mode>]] [--diagnose[=<mode>]]
DESCRIPTION DESCRIPTION
@ -51,9 +52,12 @@ OPTIONS
-s <format>:: -s <format>::
--suffix <format>:: --suffix <format>::
--no-suffix::
Specify an alternate suffix for the bugreport name, to create a file Specify an alternate suffix for the bugreport name, to create a file
named 'git-bugreport-<formatted-suffix>'. This should take the form of a named 'git-bugreport-<formatted-suffix>'. This should take the form of a
strftime(3) format string; the current local time will be used. strftime(3) format string; the current local time will be used.
`--no-suffix` disables the suffix and the file is just named
`git-bugreport` without any disambiguation measure.
--no-diagnose:: --no-diagnose::
--diagnose[=<mode>]:: --diagnose[=<mode>]::

8
builtin/bugreport.c
View File

@ -64,7 +64,8 @@ static void get_populated_hooks(struct strbuf *hook_info, int nongit)
} }
static const char * const bugreport_usage[] = { static const char * const bugreport_usage[] = {
N_("git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" N_("git bugreport [(-o | --output-directory) <path>]\n"
" [(-s | --suffix) <format> | --no-suffix]\n"
" [--diagnose[=<mode>]]"), " [--diagnose[=<mode>]]"),
NULL NULL
}; };
@ -138,8 +139,11 @@ int cmd_bugreport(int argc, const char **argv, const char *prefix)
strbuf_complete(&report_path, '/'); strbuf_complete(&report_path, '/');
output_path_len = report_path.len; output_path_len = report_path.len;
strbuf_addstr(&report_path, "git-bugreport-"); strbuf_addstr(&report_path, "git-bugreport");
if (option_suffix) {
strbuf_addch(&report_path, '-');
strbuf_addftime(&report_path, option_suffix, localtime_r(&now, &tm), 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)) {