threads / patch / 37310

patchbuiltin/log.c: fix minor memory leak

Subject: [PATCH] builtin/log.c: fix minor memory leak

## tl;dr

3 messages between Aug 7, 2014 and Aug 7, 2014. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Matthieu Moy· Aug 7, 2014, 17:13 UTC · lore

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
Valgrind confirms, one less unreachable block ;-).

 builtin/log.c | 1 +
 1 file changed, 1 insertion(+)

Show changes to builtin/log.c +1 −0

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· Aug 7, 2014, 18:04 UTC · re: Matthieu Moy · lore

Re: [PATCH] builtin/log.c: fix minor memory leak

Matthieu Moy wrote:

> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
> ---
> Valgrind confirms, one less unreachable block ;-).

This belongs in the commit message.

[...]

Show 14 quoted lines

> --- 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 <jrnieder@gmail.com>

Thanks.

Junio C Hamano· Aug 7, 2014, 19:28 UTC · re: Jonathan Nieder · lore

Re: [PATCH] builtin/log.c: fix minor memory leak

Jonathan Nieder <jrnieder@gmail.com> writes:

Show 32 quoted lines

> Matthieu Moy wrote:
>
>> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
>> ---
>> 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 ;-).

Show 7 quoted lines

>
> Less noise from static and dynamic analysis tools is still worthwhile,
> so for what it's worth,
>
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
>
> Thanks.

Thanks.