undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ls-files: fix a --with-tree memory leak

Browse Source 
Fix a memory leak in overlay_tree_on_index(), we need to
clear_pathspec() at some point, which might as well be after the last
time we use it in the function.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-11-08 19:17:45 +01:00 committed by Junio C Hamano
parent fc47252d5b
commit c07ce0602a
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/ls-files.c
View File

@ -613,6 +613,7 @@ void overlay_tree_on_index(struct index_state *istate,
if (!fn) if (!fn)
fn = read_one_entry_quick; fn = read_one_entry_quick;
err = read_tree(the_repository, tree, &pathspec, fn, istate); err = read_tree(the_repository, tree, &pathspec, fn, istate);
clear_pathspec(&pathspec);
if (err) if (err)
die("unable to read tree entries %s", tree_name); die("unable to read tree entries %s", tree_name);

2
t/t3060-ls-files-with-tree.sh
View File

@ -8,6 +8,8 @@ test_description='git ls-files test (--with-tree).
This test runs git ls-files --with-tree and in particular in This test runs git ls-files --with-tree and in particular in
a scenario known to trigger a crash with some versions of git. a scenario known to trigger a crash with some versions of git.
' '
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
test_expect_success 'setup' ' test_expect_success 'setup' '

1
t/t9148-git-svn-propset.sh
View File

@ -5,7 +5,6 @@
test_description='git svn propset tests' test_description='git svn propset tests'
TEST_FAILS_SANITIZE_LEAK=true
. ./lib-git-svn.sh . ./lib-git-svn.sh
test_expect_success 'setup propset via import' ' test_expect_success 'setup propset via import' '