undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blame: prefer xsnprintf to strcpy for colors

Browse Source 
Our color buffers are all COLOR_MAXLEN, which fits the
largest possible color. So we can never overflow the buffer
by copying an existing color. However, using strcpy() makes
it harder to audit the code-base for calls that _are_
problems. We should use something like xsnprintf(), which
shows the reader that we expect this never to fail (and
provides a run-time assertion if it does, just in case).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2018-07-13 16:43:50 -04:00 committed by Junio C Hamano
parent 297bdf0791
commit 022d2ac1f3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/blame.c
View File

@ -1060,7 +1060,9 @@ parse_done:
find_alignment(&sb, &output_option); find_alignment(&sb, &output_option);
if (!*repeated_meta_color && if (!*repeated_meta_color &&
(output_option & OUTPUT_COLOR_LINE)) (output_option & OUTPUT_COLOR_LINE))
strcpy(repeated_meta_color, GIT_COLOR_CYAN); xsnprintf(repeated_meta_color,
sizeof(repeated_meta_color),
"%s", GIT_COLOR_CYAN);
} }
if (output_option & OUTPUT_ANNOTATE_COMPAT) if (output_option & OUTPUT_ANNOTATE_COMPAT)
output_option &= ~(OUTPUT_COLOR_LINE | OUTPUT_SHOW_AGE_WITH_COLOR); output_option &= ~(OUTPUT_COLOR_LINE | OUTPUT_SHOW_AGE_WITH_COLOR);