diff options
| author | Jeff King <peff@peff.net> | 2015-09-24 17:07:03 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-25 10:18:18 -0700 |
| commit | 75faa45ae0230b321bf72027b2274315d7e14e34 (patch) | |
| tree | 3b4aa1b362078ba4db498a087f3330ffe7affbd8 /builtin/apply.c | |
| parent | b7115a350b5c01ce0ae7a8735e4235d4b2367b5f (diff) | |
| download | git-75faa45ae0230b321bf72027b2274315d7e14e34.tar.gz | |
replace trivial malloc + sprintf / strcpy calls with xstrfmt
It's a common pattern to do:
foo = xmalloc(strlen(one) + strlen(two) + 1 + 1);
sprintf(foo, "%s %s", one, two);
(or possibly some variant with strcpy()s or a more
complicated length computation). We can switch these to use
xstrfmt, which is shorter, involves less error-prone manual
computation, and removes many sprintf and strcpy calls which
make it harder to audit the code for real buffer overflows.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/apply.c')
| -rw-r--r-- | builtin/apply.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 4aa53f7fd8..094a20f489 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -698,10 +698,7 @@ static char *find_name_common(const char *line, const char *def, } if (root) { - char *ret = xmalloc(root_len + len + 1); - strcpy(ret, root); - memcpy(ret + root_len, start, len); - ret[root_len + len] = '\0'; + char *ret = xstrfmt("%s%.*s", root, len, start); return squash_slash(ret); } |