From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: peff@peff.net, gitster@pobox.com,
"Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Subject: [PATCH 1/2] tree-diff: fix leak when not HAVE_ALLOCA
Date: Wed, 15 Sep 2021 19:37:05 -0700 [thread overview]
Message-ID: <20210916023706.55760-2-carenas@gmail.com> (raw)
In-Reply-To: <20210916023706.55760-1-carenas@gmail.com>
b8ba412bf7 (tree-diff: avoid alloca for large allocations, 2016-06-07)
adds a way to route some bigger allocations out of the stack and free
them through the addition of two conveniently named macros, but leaves
the calls to free the xalloca part, which could be also in the heap,
if the system doesn't HAVE_ALLOCA (ex: macOS).
Add the missing free call, and while at it, change the expression to
match in both macros for easy of readability.
This avoids a leak reported by LSAN as while running t0000 but that
wouldn't fail the test (which will be fixed next) :
SUMMARY: LeakSanitizer: 1034 byte(s) leaked in 15 allocation(s).
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
tree-diff.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tree-diff.c b/tree-diff.c
index 1572615bd9..437c98a70e 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -21,7 +21,9 @@
ALLOC_ARRAY((x), nr); \
} while(0)
#define FAST_ARRAY_FREE(x, nr) do { \
- if ((nr) > 2) \
+ if ((nr) <= 2) \
+ xalloca_free((x)); \
+ else \
free((x)); \
} while(0)
--
2.33.0.481.g26d3bed244
next prev parent reply other threads:[~2021-09-16 2:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-16 2:37 [PATCH 0/2] t0000: truly leak free Carlo Marcelo Arenas Belón
2021-09-16 2:37 ` Carlo Marcelo Arenas Belón [this message]
2021-09-16 5:17 ` [PATCH 1/2] tree-diff: fix leak when not HAVE_ALLOCA Taylor Blau
2021-09-16 5:27 ` Junio C Hamano
2021-09-16 2:37 ` [PATCH 2/2] t0000: avoid masking git exit value through pipes Carlo Marcelo Arenas Belón
2021-09-16 5:21 ` Taylor Blau
2021-09-16 6:23 ` Junio C Hamano
2021-09-16 16:49 ` Taylor Blau
2021-09-16 5:29 ` Junio C Hamano
2021-09-16 10:45 ` Ævar Arnfjörð Bjarmason
2021-09-16 8:55 ` [PATCH v2 0/2] reroll for cb/plug-leaks-in-alloca-emu-users Carlo Marcelo Arenas Belón
2021-09-16 8:55 ` [PATCH v2 1/2] tree-diff: fix leak when not HAVE_ALLOCA_H Carlo Marcelo Arenas Belón
2021-09-16 15:00 ` Jeff King
2021-09-16 8:55 ` [PATCH v2 2/2] t0000: avoid masking git exit value through pipes Carlo Marcelo Arenas Belón
2021-09-16 16:53 ` [PATCH v2 0/2] reroll for cb/plug-leaks-in-alloca-emu-users Taylor Blau
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210916023706.55760-2-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).