dir.c: free removed sparse-pattern hashmap entries
In add_pattern_to_hashsets(), we remove entries from the recursive_hashmap when adding similar ones to the parent_hashmap. I won't pretend to understand all of what's going on here, but there's an obvious leak: whatever we removed from recursive_hashmap is not referenced anywhere else, and is never free()d. We can easily fix this by asking the hashmap to return a pointer to the old entry. This makes t7002 now completely leak-free. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jun 4, 2024 at 06:13 UTC
4c844c2f499a573e5801bd3cb83b8d42d3f1566a
2 files changed
+8
-1
dir.c
+7
-1
@@ -810,6 +810,8 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern
810
811
if (given->patternlen > 2 &&
812
!strcmp(given->pattern + given->patternlen - 2, "/*")) {
813
+ struct pattern_entry *old;
814
+
815
if (!(given->flags & PATTERN_FLAG_NEGATIVE)) {
816
/* Not a cone pattern. */
817
warning(_("unrecognized pattern: '%s'"), given->pattern);
@@ -835,7 +837,11 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern
837
}
838
839
hashmap_add(&pl->parent_hashmap, &translated->ent);
838
- hashmap_remove(&pl->recursive_hashmap, &translated->ent, &data);
840
+ old = hashmap_remove_entry(&pl->recursive_hashmap, translated, ent, &data);
841
+ if (old) {
842
+ free(old->pattern);
843
+ free(old);
844
+ }
845
free(data);
846
return;
847
}
t/t7002-mv-sparse-checkout.sh
+1
@@ -2,6 +2,7 @@
2
3
test_description='git mv in sparse working trees'
4
5
+TEST_PASSES_SANITIZE_LEAK=true
6
. ./test-lib.sh
7
8
setup_sparse_checkout () {