[PATCH v2 04/13] sparse-checkout: clear patterns when init() sees existing sparse file
- From
Jeff King <peff@peff.net>
- Date
- Jun 4, 2024, 10:13 UTC
- Message-ID
- <20240604101317.GD1304593@coredump.intra.peff.net>
- In-Reply-To
- <20240604100814.GA1304520@coredump.intra.peff.net>
In sparse_checkout_init(), we first try to load patterns from an existing file. If we found any, we return immediately, but end up leaking the patterns we parsed. Fixing this reduces the number of leaks in t7002 from 9 down to 5.
Note that there are two other exits from the function, but they don't need the same treatment:
- if we can't resolve HEAD, we write out a hard-coded sparse file and
return. But we know the pattern list is empty there, since we didn't
find any in the on-disk file and we haven't yet added any of our
own. - otherwise, we do populate the list and then tail-call into
write_patterns_and_update(). But that function frees the
pattern_list itself, so we don't need to.Signed-off-by: Jeff King <peff@peff.net> --- builtin/sparse-checkout.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c index 7c17ed238c..923e6ecc0a 100644 --- a/builtin/sparse-checkout.c +++ b/builtin/sparse-checkout.c @@ -472,6 +472,7 @@ static int sparse_checkout_init(int argc, const char **argv, const char *prefix) /* If we already have a sparse-checkout file, use it. */ if (res >= 0) { free(sparse_filename); + clear_pattern_list(&pl); return update_working_directory(NULL); }
-- 2.45.2.807.g3b5fadc4da