[PATCH 1/3] format_config: don't init strbuf
- From
Jeff King <peff@peff.net>
- Date
- Aug 20, 2015, 14:46 UTC
- Message-ID
- <20150820144604.GA11913@sigill.intra.peff.net>
- In-Reply-To
- <20150820144504.GA22935@sigill.intra.peff.net>
It's unusual for a function which writes to a passed-in strbuf to call strbuf_init; that will throw away anything already there, leaking memory. In this case, there are exactly two callers; one relies on this initialization and the other passes in an already-initialized buffer.
There's no leak, as the initialized buffer doesn't have anything in it. But let's bump the strbuf_init out to the one caller who needs it, making format_config more idiomatic.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/config.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c index 810e104..91aa56f 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -108,8 +108,6 @@ struct strbuf_list { static int format_config(struct strbuf *buf, const char *key_, const char *value_) { - strbuf_init(buf, 0); - if (show_keys) strbuf_addstr(buf, key_); if (!omit_values) { @@ -166,6 +164,7 @@ static int collect_config(const char *key_, const char *value_, void *cb) return 0; ALLOC_GROW(values->items, values->nr + 1, values->alloc); + strbuf_init(&values->items[values->nr], 0); return format_config(&values->items[values->nr++], key_, value_); }
-- 2.5.0.680.g69e7703