Merge branch 'sb/blame-color' into jk/banned-function

* sb/blame-color: blame: prefer xsnprintf to strcpy for colors
2018-07-20 14:42:53 -07:00
parent b7bd9486b0 022d2ac1f3
commit b20a3cbb88
1 changed files with 3 additions and 1 deletions
--- a/builtin/blame.c
+++ b/builtin/blame.c
@ -1071,7 +1071,9 @@ parse_done:
 		find_alignment(&sb, &output_option);
 		if (!*repeated_meta_color &&
 		    (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)
 		output_option &= ~(OUTPUT_COLOR_LINE | OUTPUT_SHOW_AGE_WITH_COLOR);