git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: Jeff King <peff@peff.net>
Cc: Stefan Beller <sbeller@google.com>,
	Junio C Hamano <gitster@pobox.com>,
	Git List <git@vger.kernel.org>
Subject: Re: [PATCH 4/6] abbrev_sha1_in_line: don't leak memory
Date: Tue, 29 Mar 2016 21:30:38 -0400	[thread overview]
Message-ID: <CAPig+cR=Zc2QAQTPAqTt4M-nJRw4StCoqT2hYtmHOvi6LseN_A@mail.gmail.com> (raw)
In-Reply-To: <20160330011111.GB2237@sigill.intra.peff.net>

On Tue, Mar 29, 2016 at 9:11 PM, Jeff King <peff@peff.net> wrote:
> On Tue, Mar 29, 2016 at 05:38:51PM -0700, Stefan Beller wrote:
>> `split` is of type `struct strbuf **` and just before the new free,
>> we release the inner strbufs. Make sure to also release the memory
>> containing the pointers to the individual strbufs.
>>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>> diff --git a/wt-status.c b/wt-status.c
>> @@ -1065,7 +1065,7 @@ static void abbrev_sha1_in_line(struct strbuf *line)
>>       }
>>       for (i = 0; split[i]; i++)
>>               strbuf_release(split[i]);
>> -
>> +     free(split);
>>  }
>
> I think this can just combine with the for-loop above to become
> strbuf_list_free().

The implementation of strbuf_list_free() is this:

    struct strbuf **s = sbs;
    while (*s) {
        strbuf_release(*s);
        free(*s++);
    }
    free(sbs);

which means that wt-status.c is leaking not only 'split', but also
each element of split[], right?

  reply	other threads:[~2016-03-30  1:30 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-30  0:38 [PATCH 0/6] Some cleanups Stefan Beller
2016-03-30  0:38 ` [PATCH 1/6] path.c: allocate enough memory for string Stefan Beller
2016-03-30  0:56   ` Junio C Hamano
2016-03-30  0:57   ` Eric Sunshine
2016-03-30 16:41     ` Stefan Beller
2016-03-30 17:16       ` Junio C Hamano
2016-03-30  0:38 ` [PATCH 2/6] imap-send.c, cram: allocate enough memory for null terminated string Stefan Beller
2016-03-30  1:02   ` Eric Sunshine
2016-03-30  1:07   ` Jeff King
2016-03-30  0:38 ` [PATCH 3/6] notes: don't leak memory in git_config_get_notes_strategy Stefan Beller
2016-03-30  1:11   ` Eric Sunshine
2016-03-30  1:13   ` Jeff King
2016-03-30 17:17     ` Junio C Hamano
2016-03-30  0:38 ` [PATCH 4/6] abbrev_sha1_in_line: don't leak memory Stefan Beller
2016-03-30  1:11   ` Jeff King
2016-03-30  1:30     ` Eric Sunshine [this message]
2016-03-30  1:31       ` Jeff King
2016-03-30 17:06         ` Junio C Hamano
2016-03-30 17:21           ` Jeff King
2016-03-30  0:38 ` [PATCH 5/6] bundle: don't leak an fd in case of early return Stefan Beller
2016-03-30  1:17   ` Jeff King
2016-03-30 17:19     ` Junio C Hamano
2016-03-30  0:38 ` [PATCH 6/6] credential-cache, send_request: close fd when done Stefan Beller
2016-03-30  1:20   ` 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

  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='CAPig+cR=Zc2QAQTPAqTt4M-nJRw4StCoqT2hYtmHOvi6LseN_A@mail.gmail.com' \
    --to=sunshine@sunshineco.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    --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).