[PATCH 4/5] shorten_unambiguous_ref: use xsnprintf
- From
Jeff King <peff@peff.net>
- Date
- May 19, 2018, 01:58 UTC
- Message-ID
- <20180519015819.GD32492@sigill.intra.peff.net>
- In-Reply-To
- <20180519015444.GA12080@sigill.intra.peff.net>
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> --- refs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/refs.c b/refs.c index 64aadd14c9..73c446628f 100644 --- a/refs.c +++ b/refs.c @@ -1147,8 +1147,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; } }
-- 2.17.0.1052.g7d69f75dbf