@matheusbsbs / matheus-bagliano / commits / e5a917fcf4

unpack-trees: don't leak memory in verify_clean_subdirectory()

Fix two different but related memory leaks in verify_clean_subdirectory(). We leaked both the "pathbuf" if read_directory() returned non-zero, and we never cleaned up our own "struct dir_struct" either. * "pathbuf": When the read_directory() call followed by the free(pathbuf) was added in c81935348be (Fix switching to a branch with D/F when current branch has file D., 2007-03-15) we didn't bother to free() before we called die(). But when this code was later libified in 203a2fe1170 (Allow callers of unpack_trees() to handle failure, 2008-02-07) we started to leak as we returned data to the caller. This fixes that memory leak, which can be observed under SANITIZE=leak with e.g. the "t1001-read-tree-m-2way.sh" test. * "struct dir_struct": We've leaked the dir_struct ever since this code was added back in c81935348be. When that commit was written there wasn't an equivalent of dir_clear(). Since it was added in 270be816049 (dir.c: provide clear_directory() for reclaiming dir_struct memory, 2013-01-06) we've omitted freeing the memory allocated here. This memory leak could also be observed under SANITIZE=leak and the "t1001-read-tree-m-2way.sh" test. This makes all the test in "t1001-read-tree-m-2way.sh" pass under "GIT_TEST_PASSING_SANITIZE_LEAK=true", we'd previously die in tests 25, 26 & 28. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Oct 7, 2021 at 11:46 UTC e5a917fcf42d2e22017ae501ffdd1c2108a1431e

2 files changed +4 -1

t/t1001-read-tree-m-2way.sh

@@ -20,6 +20,8 @@ In the test, these paths are used:

20 rezrov - in H, deleted in M

21 yomin - not in H or M

22 '

23 +

24 +TEST_PASSES_SANITIZE_LEAK=true

25 . ./test-lib.sh

26 . "$TEST_DIRECTORY"/lib-read-tree.sh

unpack-trees.c

+2 -1

@@ -2136,9 +2136,10 @@ static int verify_clean_subdirectory(const struct cache_entry *ce,

2136 if (o->dir)

2137 d.exclude_per_dir = o->dir->exclude_per_dir;

2138 i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);

2139 + dir_clear(&d);

2140 + free(pathbuf);

2141 if (i)

2142 return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);

2141 - free(pathbuf);

2143 return cnt;

2144 }

2145