use xstrfmt to replace xmalloc + strcpy/strcat
It's easy to get manual allocation calculations wrong, and the use of strcpy/strcat raise red flags for people looking for buffer overflows (though in this case each site was fine). It's also shorter to use xstrfmt, and the printf-format tends to be easier for a reader to see what the final string will look like. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
283101869b
commit
b2724c8787
@ -1281,9 +1281,7 @@ static int parse_git_header(const char *line, int len, unsigned int size, struct
|
||||
*/
|
||||
patch->def_name = git_header_name(line, len);
|
||||
if (patch->def_name && root) {
|
||||
char *s = xmalloc(root_len + strlen(patch->def_name) + 1);
|
||||
strcpy(s, root);
|
||||
strcpy(s + root_len, patch->def_name);
|
||||
char *s = xstrfmt("%s%s", root, patch->def_name);
|
||||
free(patch->def_name);
|
||||
patch->def_name = s;
|
||||
}
|
||||
|
Reference in New Issue
Block a user