From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefan Beller <sbeller@google.com>,
Johannes.Schindelin@gmx.de, git@vger.kernel.org
Subject: Re: [PATCH 2/2] sequencer.c: plug mem leak in git_sequencer_config
Date: Mon, 4 Jun 2018 01:00:34 -0400 [thread overview]
Message-ID: <20180604050033.GA17818@sigill.intra.peff.net> (raw)
In-Reply-To: <20180604035637.GA15408@sigill.intra.peff.net>
On Sun, Jun 03, 2018 at 11:56:37PM -0400, Jeff King wrote:
> So sometimes some_var needs to be freed and sometimes not (and every one
> of those uses is a potential leak, but it's OK because they're all
> program-lifetime globals anyway, and people don't _tend_ to set the same
> option over and over, leaking heap memory). And C being C, we can't
> convert a pointer-to-pointer-to-const into a pointer-to-pointer without
> an explicit cast.
>
> Doing it "right" in C would probably involve two variables:
>
> const char *some_var = "default";
> const char *some_var_storage = NULL;
>
> int git_config_string_smart(const char **ptr, char **storage,
> const char *var, const char *value)
> {
> ...
> free(*storage);
> *ptr = *storage = xstrdup(value);
> return 0;
> }
>
> #define GIT_CONFIG_STRING(name, var, value) \
> git_config_string_smart(&(name), &(name##_storage), var, value)
>
> Or something like that.
Oh, one other option I forgot to mention: we already have an "intern"
hashmap helper. So we could just replace the xstrdup() with strintern()
and magically the memory isn't "leaked".
I think this is a little bit of a hack, though. It catches my:
[core]
editor = foo
editor = foo
case, because we only ever make one copy of the string "foo". But if I
do:
[core]
editor = 1
editor = 2
...
then we get unique strings. And while they're not _technically_ leaked,
since the hashmap still knows about them, they might as well be. They're
still wasting space through the duration of the program run.
-Peff
prev parent reply other threads:[~2018-06-04 5:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-01 20:01 [PATCH 1/2] sequencer.c: plug leaks in do_pick_commit Stefan Beller
2018-06-01 20:01 ` [PATCH 2/2] sequencer.c: plug mem leak in git_sequencer_config Stefan Beller
2018-06-04 2:41 ` Junio C Hamano
2018-06-04 3:44 ` Junio C Hamano
2018-06-04 3:56 ` Jeff King
2018-06-04 4:26 ` Junio C Hamano
2018-06-04 4:51 ` Jeff King
2018-06-04 4:55 ` Junio C Hamano
2018-06-21 7:03 ` Johannes Schindelin
2018-06-21 11:46 ` Jeff King
2018-06-04 5:00 ` Jeff King [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180604050033.GA17818@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).