shorten_unambiguous_ref: use xsnprintf
We convert the ref_rev_parse_rules array into scanf formats on the fly, and use snprintf() to write into each string. We should have enough memory to hold everything because of the earlier total_len computation. Let's use xsnprintf() to give runtime confirmation that this is the case, and to make it easy for people auditing the code to know there's no truncation bug. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
735e4173b3
commit
bf4baf1fed
4
refs.c
4
refs.c
@ -1132,8 +1132,8 @@ char *shorten_unambiguous_ref(const char *refname, int strict)
|
||||
for (i = 0; i < nr_rules; i++) {
|
||||
assert(offset < total_len);
|
||||
scanf_fmts[i] = (char *)&scanf_fmts[nr_rules] + offset;
|
||||
offset += snprintf(scanf_fmts[i], total_len - offset,
|
||||
ref_rev_parse_rules[i], 2, "%s") + 1;
|
||||
offset += xsnprintf(scanf_fmts[i], total_len - offset,
|
||||
ref_rev_parse_rules[i], 2, "%s") + 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user