admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unpack-trees: detect mismatching number of cache-tree/index entries

Browse Source 
Same as the preceding commit, we unconditionally dereference the index's
cache entries depending on the number of cache-tree entries, which can
lead to a segfault when the cache-tree is corrupted. Fix this bug.

This also makes t4058 pass with the leak sanitizer enabled.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-10-07 06:38:21 +02:00
committed by Junio C Hamano
parent 2be7fc012e
commit ecb5c4318c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
t/t4058-diff-duplicates.sh
View File

@@ -10,6 +10,8 @@
# that the diff output isn't wildly unreasonable. # that the diff output isn't wildly unreasonable.
test_description='test tree diff when trees have duplicate entries' test_description='test tree diff when trees have duplicate entries'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
# make_tree_entry <mode> <mode> <sha1> # make_tree_entry <mode> <mode> <sha1>
@@ -143,11 +145,12 @@ test_expect_success 'reset --hard does not segfault' '
test_grep "error: corrupted cache-tree has entries not present in index" err test_grep "error: corrupted cache-tree has entries not present in index" err
' '
test_expect_failure 'git diff HEAD does not segfault' ' test_expect_success 'git diff HEAD does not segfault' '
git checkout base && git checkout base &&
GIT_TEST_CHECK_CACHE_TREE=false && GIT_TEST_CHECK_CACHE_TREE=false &&
git reset --hard && git reset --hard &&
test_might_fail git diff HEAD test_must_fail git diff HEAD 2>err &&
test_grep "error: corrupted cache-tree has entries not present in index" err
' '
test_expect_failure 'can switch to another branch when status is empty' ' test_expect_failure 'can switch to another branch when status is empty' '

2
unpack-trees.c
View File

@@ -808,6 +808,8 @@ static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names,
if (!o->merge) if (!o->merge)
BUG("We need cache-tree to do this optimization"); BUG("We need cache-tree to do this optimization");
if (nr_entries + pos > o->src_index->cache_nr)
return error(_("corrupted cache-tree has entries not present in index"));
/* /*
* Do what unpack_callback() and unpack_single_entry() normally * Do what unpack_callback() and unpack_single_entry() normally