diff options
| author | Jeff King <peff@peff.net> | 2015-09-24 21:07:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-25 17:18:18 (GMT) |
| commit | 75faa45ae0230b321bf72027b2274315d7e14e34 (patch) | |
| tree | 3b4aa1b362078ba4db498a087f3330ffe7affbd8 /builtin/name-rev.c | |
| parent | b7115a350b5c01ce0ae7a8735e4235d4b2367b5f (diff) | |
| download | git-75faa45ae0230b321bf72027b2274315d7e14e34.zip git-75faa45ae0230b321bf72027b2274315d7e14e34.tar.gz git-75faa45ae0230b321bf72027b2274315d7e14e34.tar.bz2 | |
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/name-rev.c')
| -rw-r--r-- | builtin/name-rev.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 248a3eb..8a3a0cd 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -56,19 +56,16 @@ copy_data: parents = parents->next, parent_number++) { if (parent_number > 1) { int len = strlen(tip_name); - char *new_name = xmalloc(len + - 1 + decimal_length(generation) + /* ~<n> */ - 1 + 2 + /* ^NN */ - 1); + char *new_name; if (len > 2 && !strcmp(tip_name + len - 2, "^0")) len -= 2; if (generation > 0) - sprintf(new_name, "%.*s~%d^%d", len, tip_name, - generation, parent_number); + new_name = xstrfmt("%.*s~%d^%d", len, tip_name, + generation, parent_number); else - sprintf(new_name, "%.*s^%d", len, tip_name, - parent_number); + new_name = xstrfmt("%.*s^%d", len, tip_name, + parent_number); name_rev(parents->item, new_name, 0, distance + MERGE_TRAVERSAL_WEIGHT, 0); |