diff options
author | Jeff Hostetler <jeffhost@microsoft.com> | 2021-08-16 17:48:55 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 09:24:12 -0700 |
commit | d9e9b44d7a022ebc57caa3762d1af7e6bf608d5f (patch) | |
tree | abc61e3dd556cd22d2b969fc22dff2daa2fd7ab8 /Documentation/merge-strategies.txt | |
parent | Git 2.33 (diff) | |
download | tgif-d9e9b44d7a022ebc57caa3762d1af7e6bf608d5f.tar.xz |
sparse-index: copy dir_hash in ensure_full_index()
Copy the 'index_state->dir_hash' back to the real istate after expanding
a sparse index.
A crash was observed in 'git status' during some hashmap lookups with
corrupted hashmap entries. During an index expansion, new cache-entries
are added to the 'index_state->name_hash' and the 'dir_hash' in a
temporary 'index_state' variable 'full'. However, only the 'name_hash'
hashmap from this temp variable was copied back into the real 'istate'
variable. The original copy of the 'dir_hash' was incorrectly
preserved. If the table in the 'full->dir_hash' hashmap were realloced,
the stale version (in 'istate') would be corrupted.
The test suite does not operate on index sizes sufficiently large to
trigger this reallocation, so they do not cover this behavior.
Increasing the test suite to cover such scale is fragile and likely
wasteful.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions