From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Stefan Beller <sbeller@google.com>, Jeff King <peff@peff.net>,
Git List <git@vger.kernel.org>
Subject: Re: [PATCHv2 1/4] notes: don't leak memory in git_config_get_notes_strategy
Date: Wed, 30 Mar 2016 14:07:14 -0700 [thread overview]
Message-ID: <xmqqegarsmil.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAPig+cTeVgyNHa5uHUMDZ6ifxyjk2wvm=jGd9tP1+BuBKKVR+g@mail.gmail.com> (Eric Sunshine's message of "Wed, 30 Mar 2016 13:32:46 -0400")
Eric Sunshine <sunshine@sunshineco.com> writes:
>> diff --git a/builtin/notes.c b/builtin/notes.c
>> @@ -744,13 +744,14 @@ static int merge_commit(struct notes_merge_options *o)
>> static int git_config_get_notes_strategy(const char *key,
>> enum notes_merge_strategy *strategy)
>> {
>> - const char *value;
>> + char *value;
>>
>> - if (git_config_get_string_const(key, &value))
>> + if (git_config_get_string(key, &value))
>> return 1;
>> if (parse_notes_merge_strategy(value, strategy))
>> git_die_config(key, "unknown notes merge strategy %s", value);
>>
>> + free(value);
>> return 0;
>> }
>
> Hmm, I thought Peff's suggestion of using git_config_get_value() was
> accepted as superior since it avoids the allocation altogether, thus
> no need for free() and no leak.
I agree that this caller can avoid taking ownership of value by
using git_config_get_value() and that would be a cleaner solution
here.
This is a tangent, but am I the only one who finds that the naming
of functions in config-get API is confusing? Just wondering if we
should rename the ones that keeps the memory ownership to the config
subsystem with s/get/peek/ or something.
next prev parent reply other threads:[~2016-03-30 21:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 17:05 [PATCHv2 0/4] Some cleanups Stefan Beller
2016-03-30 17:05 ` [PATCHv2 1/4] notes: don't leak memory in git_config_get_notes_strategy Stefan Beller
2016-03-30 17:32 ` Eric Sunshine
2016-03-30 21:07 ` Junio C Hamano [this message]
2016-03-30 21:10 ` Stefan Beller
2016-03-31 1:06 ` Jeff King
2016-03-31 2:59 ` Junio C Hamano
2016-03-30 17:05 ` [PATCHv2 2/4] abbrev_sha1_in_line: don't leak memory Stefan Beller
2016-03-30 17:35 ` Eric Sunshine
2016-03-30 17:05 ` [PATCHv2 3/4] bundle: don't leak an fd in case of early return Stefan Beller
2016-03-30 17:23 ` Jeff King
2016-03-30 17:41 ` Eric Sunshine
2016-03-31 17:47 ` Stefan Beller
2016-03-31 19:00 ` Philip Oakley
2016-04-01 0:25 ` Stefan Beller
2016-04-01 7:26 ` Philip Oakley
2016-03-30 17:05 ` [PATCHv2 4/4] credential-cache, send_request: close fd when done Stefan Beller
2016-03-30 17:25 ` [PATCHv2 0/4] Some cleanups Jeff King
2016-03-30 17:32 ` Stefan Beller
2016-03-30 17:38 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqegarsmil.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sbeller@google.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.