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

Re: [PATCH v2] path.c enter_repo(): fix unproper strbuf unwrapping and memory leakage

From
惠轶群 <huiyiqun@gmail.com>
Date
Mar 29, 2016, 02:40 UTC
Message-ID
<CAKqreuxRbZ6VKNVbv+cNCJdguT3mt0Zy53vXZ+8dg0e1J3x59g@mail.gmail.com>
In-Reply-To
<20160328175528.GB20028@sigill.intra.peff.net>
2016-03-29 1:55 GMT+08:00 Jeff King <peff@peff.net>:
Show 28 quoted lines
> On Mon, Mar 28, 2016 at 11:56:10PM +0800, Hui Yiqun wrote:
>
>> According to strbuf.h, strbuf_detach is the sole supported method
>> to unwrap a memory buffer from its strbuf shell.
>>
>> So we should not return the pointer of strbuf.buf directly.
>>
>> What's more, some memory leakages are solved.
>
> There is something else going on here, which makes this case different
> than some others. Note that the function returns a const string:
>
>> diff --git a/path.c b/path.c
>> index 969b494..b07e5a7 100644
>> --- a/path.c
>> +++ b/path.c
>> @@ -625,6 +625,7 @@ const char *enter_repo(const char *path, int strict)
>
> By convention, that means that the result is not owned by the caller,
> and should not be freed. We implement that by:
>
>>  {
>>       static struct strbuf validated_path = STRBUF_INIT;
>>       static struct strbuf used_path = STRBUF_INIT;
>
> ...using static variables which persist after the call returns. So this
> function retains ownership of the memory, and it remains valid until the
> next call to enter_repo().
Sorry for my carelessness. I didn't notice it.
Show 10 quoted lines
> There's no leak when we return NULL, because the function retains
> control of the memory (though it will hold onto it until the end of the
> program if nobody calls enter_repo() again). And thus we shouldn't use
> strbuf_detach(), which loses that reference to the memory (and since the
> callers don't take ownership, it actually _creates_ a leak).
>
> We could release the memory when returning, but I don't think it's a big
> deal to do so.
>
> -Peff
Previous: Jeff KingNext: Hui Yiqun
Message 19 of 33 in “path.c: implement strbuf_mkpath()”
  1. 1/5 path.c: implement strbuf_mkpath()Hui Yiqun, Mar 23, 2016
  2. 2/5 path.c: implement xdg_runtime_dir()Hui Yiqun, Mar 23, 2016
  3. Jeff KingMar 25, 2016
  4. 惠轶群Mar 25, 2016
  5. 惠轶群Mar 25, 2016
  6. Junio C HamanoMar 25, 2016
  7. Jeff KingMar 25, 2016
  8. Junio C HamanoMar 25, 2016
  9. 惠轶群Mar 28, 2016
  10. Junio C HamanoMar 28, 2016
  11. Jeff KingMar 25, 2016
  12. 惠轶群Mar 28, 2016
  13. Junio C HamanoMar 28, 2016
  14. 惠轶群Mar 28, 2016
  15. Junio C HamanoMar 28, 2016
  16. path.c enter_repo(): fix unproper strbuf unwrapping and memory leakageHui Yiqun, Mar 28, 2016
  17. path.c enter_repo(): fix unproper strbuf unwrapping and memory leakageHui Yiqun, Mar 28, 2016
  18. Jeff KingMar 28, 2016
  19. 惠轶群Mar 29, 2016
  20. path.c enter_repo(): fix unproper strbuf unwrapping and memory leakageHui Yiqun, Mar 28, 2016
  21. 惠轶群Mar 28, 2016
  22. Junio C HamanoMar 28, 2016
  23. 惠轶群Mar 29, 2016
  24. 3/5 git-credential-cache: put socket to xdg-compatible pathHui Yiqun, Mar 23, 2016
  25. Jeff KingMar 25, 2016
  26. 惠轶群Mar 25, 2016
  27. Jeff KingMar 25, 2016
  28. 惠轶群Mar 25, 2016
  29. 4/5 test-lib.sh: unset all environment variables defined in xdg base dir spec[1]Hui Yiqun, Mar 23, 2016
  30. Jeff KingMar 25, 2016
  31. 5/5 t0301: test credential-cache support of XDG_RUNTIME_DIRHui Yiqun, Mar 23, 2016
  32. 惠轶群Mar 25, 2016
  33. Jeff KingMar 25, 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.