git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 4/6] abbrev_sha1_in_line: don't leak memory

From
Jeff King <peff@peff.net>
Date
Mar 30, 2016, 01:31 UTC
Message-ID
<20160330013127.GA6680@sigill.intra.peff.net>
In-Reply-To
<CAPig+cR=Zc2QAQTPAqTt4M-nJRw4StCoqT2hYtmHOvi6LseN_A@mail.gmail.com>
On Tue, Mar 29, 2016 at 09:30:38PM -0400, Eric Sunshine wrote:
Show 31 quoted lines
> 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?
Yeah, I didn't notice that, but I think you're right.
-Peff
Previous: Eric SunshineNext: Junio C Hamano
Message 17 of 24 in “Some cleanups”
  1. 0/6 Some cleanupsStefan Beller, Mar 30, 2016
  2. 1/6 path.c: allocate enough memory for stringStefan Beller, Mar 30, 2016
  3. Junio C HamanoMar 30, 2016
  4. Eric SunshineMar 30, 2016
  5. Stefan BellerMar 30, 2016
  6. Junio C HamanoMar 30, 2016
  7. 2/6 imap-send.c, cram: allocate enough memory for null terminated stringStefan Beller, Mar 30, 2016
  8. Eric SunshineMar 30, 2016
  9. Jeff KingMar 30, 2016
  10. 3/6 notes: don't leak memory in git_config_get_notes_strategyStefan Beller, Mar 30, 2016
  11. Eric SunshineMar 30, 2016
  12. Jeff KingMar 30, 2016
  13. Junio C HamanoMar 30, 2016
  14. 4/6 abbrev_sha1_in_line: don't leak memoryStefan Beller, Mar 30, 2016
  15. Jeff KingMar 30, 2016
  16. Eric SunshineMar 30, 2016
  17. Jeff KingMar 30, 2016
  18. Junio C HamanoMar 30, 2016
  19. Jeff KingMar 30, 2016
  20. 5/6 bundle: don't leak an fd in case of early returnStefan Beller, Mar 30, 2016
  21. Jeff KingMar 30, 2016
  22. Junio C HamanoMar 30, 2016
  23. 6/6 credential-cache, send_request: close fd when doneStefan Beller, Mar 30, 2016
  24. Jeff KingMar 30, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.