# [PATCH] builtin/log.c: fix minor memory leak 3 messages from 2014-08-07 to 2014-08-07. Participants: Matthieu Moy, Jonathan Nieder, Junio C Hamano. Thread: https://gitlist.dev/t/37310 ## Matthieu Moy, 2014-08-07 17:13 Subject: [PATCH] builtin/log.c: fix minor memory leak Message-ID: <1407431617-4156-1-git-send-email-Matthieu.Moy@imag.fr> URL: https://gitlist.dev/e/1407431617-4156-1-git-send-email-Matthieu.Moy%40imag.fr ``` Signed-off-by: Matthieu Moy --- Valgrind confirms, one less unreachable block ;-). builtin/log.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/log.c b/builtin/log.c index 4389722..e4d8122 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -857,20 +857,21 @@ static void add_branch_description(struct strbuf *buf, const char *branch_name) { struct strbuf desc = STRBUF_INIT; if (!branch_name || !*branch_name) return; read_branch_desc(&desc, branch_name); if (desc.len) { strbuf_addch(buf, '\n'); strbuf_addbuf(buf, &desc); strbuf_addch(buf, '\n'); } + strbuf_release(&desc); } static char *find_branch_name(struct rev_info *rev) { int i, positive = -1; unsigned char branch_sha1[20]; const unsigned char *tip_sha1; const char *ref, *v; char *full_ref, *branch = NULL; -- 2.0.2.737.gfb43bde ``` ## Jonathan Nieder, 2014-08-07 18:04 Subject: Re: [PATCH] builtin/log.c: fix minor memory leak Message-ID: <20140807180435.GD12427@google.com> URL: https://gitlist.dev/e/20140807180435.GD12427%40google.com In-Reply-To: <1407431617-4156-1-git-send-email-Matthieu.Moy@imag.fr> ``` Matthieu Moy wrote: > Signed-off-by: Matthieu Moy > --- > Valgrind confirms, one less unreachable block ;-). This belongs in the commit message. [...] > --- a/builtin/log.c > +++ b/builtin/log.c > @@ -857,20 +857,21 @@ static void add_branch_description(struct strbuf *buf, const char *branch_name) > { > struct strbuf desc = STRBUF_INIT; > if (!branch_name || !*branch_name) > return; > read_branch_desc(&desc, branch_name); > if (desc.len) { > strbuf_addch(buf, '\n'); > strbuf_addbuf(buf, &desc); > strbuf_addch(buf, '\n'); > } > + strbuf_release(&desc); This is an old one. The leak was introduced by v1.7.9-rc1~1^2~12 (format-patch: use branch description in cover letter, 2011-09-21). I was a little scared to see a leak in 'git log' code, since most of what log does involves looping over many commits. Luckily this one is only used in make_cover_letter to create a cover letter describing the single branch on the command line, making it is a small, one-time leak. Less noise from static and dynamic analysis tools is still worthwhile, so for what it's worth, Reviewed-by: Jonathan Nieder Thanks. ``` ## Junio C Hamano, 2014-08-07 19:28 Subject: Re: [PATCH] builtin/log.c: fix minor memory leak Message-ID: URL: https://gitlist.dev/e/xmqq1tssksk6.fsf%40gitster.dls.corp.google.com In-Reply-To: <20140807180435.GD12427@google.com> ``` Jonathan Nieder writes: > Matthieu Moy wrote: > >> Signed-off-by: Matthieu Moy >> --- >> Valgrind confirms, one less unreachable block ;-). > > This belongs in the commit message. > > [...] >> --- a/builtin/log.c >> +++ b/builtin/log.c >> @@ -857,20 +857,21 @@ static void add_branch_description(struct strbuf *buf, const char *branch_name) >> { >> struct strbuf desc = STRBUF_INIT; >> if (!branch_name || !*branch_name) >> return; >> read_branch_desc(&desc, branch_name); >> if (desc.len) { >> strbuf_addch(buf, '\n'); >> strbuf_addbuf(buf, &desc); >> strbuf_addch(buf, '\n'); >> } >> + strbuf_release(&desc); > > This is an old one. The leak was introduced by v1.7.9-rc1~1^2~12 > (format-patch: use branch description in cover letter, 2011-09-21). > > I was a little scared to see a leak in 'git log' code, since most of > what log does involves looping over many commits. Luckily this one is > only used in make_cover_letter to create a cover letter describing the > single branch on the command line, making it is a small, one-time > leak. Exactly ;-). > > Less noise from static and dynamic analysis tools is still worthwhile, > so for what it's worth, > > Reviewed-by: Jonathan Nieder > > Thanks. Thanks. ```